Merge branch 'c-runtime' into compact-pgf

.github/workflows/build-all-versions.yml

@@ -1,103 +0,0 @@
-# Based on the template here: https://kodimensional.dev/github-actions
-name: Build with stack and cabal
-
-# Trigger the workflow on push or pull request, but only for the master branch
-on:
-  pull_request:
-  push:
-    branches: [master]
-
-jobs:
-  cabal:
-    name: ${{ matrix.os }} / ghc ${{ matrix.ghc }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
-        cabal: ["latest"]
-        ghc:
-          - "8.6.5"
-          - "8.8.3"
-          - "8.10.7"
-        exclude:
-          - os: macos-latest
-            ghc: 8.8.3
-          - os: macos-latest
-            ghc: 8.6.5
-          - os: windows-latest
-            ghc: 8.8.3
-          - os: windows-latest
-            ghc: 8.6.5
-
-    steps:
-    - uses: actions/checkout@v2
-      if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
-
-    - uses: haskell/actions/setup@v1.2.9
-      id: setup-haskell-cabal
-      name: Setup Haskell
-      with:
-        ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
-
-    - name: Freeze
-      run: |
-        cabal freeze
-
-    - uses: actions/cache@v1
-      name: Cache ~/.cabal/store
-      with:
-        path: ${{ steps.setup-haskell-cabal.outputs.cabal-store }}
-        key: ${{ runner.os }}-${{ matrix.ghc }}
-        # key: ${{ runner.os }}-${{ matrix.ghc }}-${{ hashFiles('cabal.project.freeze') }}
-
-    - name: Build
-      run: |
-        cabal configure --enable-tests --enable-benchmarks --test-show-details=direct
-        cabal build all
-
-    # - name: Test
-    #   run: |
-    #     cabal test all
-
-  stack:
-    name: stack / ghc ${{ matrix.ghc }}
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        stack: ["latest"]
-        ghc: ["7.10.3","8.0.2", "8.2.2", "8.4.4", "8.6.5", "8.8.4", "8.10.7", "9.0.2"]
-        # ghc: ["8.8.3"]
-
-    steps:
-    - uses: actions/checkout@v2
-      if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
-
-    - uses: haskell/actions/setup@v1.2.9
-      name: Setup Haskell Stack
-      with:
-        ghc-version: ${{ matrix.ghc }}
-        stack-version: 'latest'
-        enable-stack: true
-
-
-    # Fix linker errrors on ghc-7.10.3 for ubuntu (see https://github.com/commercialhaskell/stack/blob/255cd830627870cdef34b5e54d670ef07882523e/doc/faq.md#i-get-strange-ld-errors-about-recompiling-with--fpic)
-    - run: sed -i.bak 's/"C compiler link flags", "/&-no-pie /' /home/runner/.ghcup/ghc/7.10.3/lib/ghc-7.10.3/settings
-      if: matrix.ghc == '7.10.3'
-
-    - uses: actions/cache@v1
-      name: Cache ~/.stack
-      with:
-        path: ~/.stack
-        key: ${{ runner.os }}-${{ matrix.ghc }}-stack--${{ hashFiles(format('stack-ghc{0}', matrix.ghc)) }}
-        restore-keys: |
-             ${{ runner.os }}-${{ matrix.ghc }}-stack
-
-    - name: Build
-      run: |
-        stack build --system-ghc --stack-yaml stack-ghc${{ matrix.ghc }}.yaml
-        # stack build --system-ghc --test --bench --no-run-tests --no-run-benchmarks
-
-    - name: Test
-      run: |
-        stack test --system-ghc --stack-yaml stack-ghc${{ matrix.ghc }}.yaml

.github/workflows/build-binary-packages.yml

@@ -1,230 +0,0 @@
-name: Build Binary Packages
-
-on:
-  workflow_dispatch:
-  release: 
-    types: ["created"]
-
-jobs:
-
-# ---
-
-  ubuntu:
-    name: Build Ubuntu package
-    strategy:
-      matrix:
-        os:
-        - ubuntu-18.04
-        - ubuntu-20.04
-
-    runs-on: ${{ matrix.os }}
-
-    steps:
-    - uses: actions/checkout@v2
-
-    # Note: `haskell-platform` is listed as requirement in debian/control,
-    # which is why it's installed using apt instead of the Setup Haskell action.
-
-    # - name: Setup Haskell
-    #   uses: actions/setup-haskell@v1
-    #   id: setup-haskell-cabal
-    #   with:
-    #     ghc-version: ${{ matrix.ghc }}
-    #     cabal-version: ${{ matrix.cabal }}
-
-    - name: Install build tools
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y \
-          make \
-          dpkg-dev \
-          debhelper \
-          haskell-platform \
-          libghc-json-dev \
-          python-dev \
-          default-jdk \
-          libtool-bin
-
-    - name: Build package
-      run: |
-        make deb
-
-    - name: Copy package
-      run: |
-        cp ../gf_*.deb dist/
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: gf-${{ github.event.release.tag_name }}-${{ matrix.os }}.deb
-        path: dist/gf_*.deb
-        if-no-files-found: error
-
-    - name: Rename package for specific ubuntu version
-      run: |
-        mv dist/gf_*.deb dist/gf-${{ github.event.release.tag_name }}-${{ matrix.os }}.deb
-
-    - uses: actions/upload-release-asset@v1.0.2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ github.event.release.upload_url }}
-        asset_path: dist/gf-${{ github.event.release.tag_name }}-${{ matrix.os }}.deb
-        asset_name: gf-${{ github.event.release.tag_name }}-${{ matrix.os }}.deb
-        asset_content_type: application/octet-stream
-
-# ---
-
-  macos:
-    name: Build macOS package
-    strategy:
-      matrix:
-        ghc: ["8.6.5"]
-        cabal: ["2.4"]
-        os: ["macos-10.15"]
-    runs-on: ${{ matrix.os }}
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Setup Haskell
-      uses: actions/setup-haskell@v1
-      id: setup-haskell-cabal
-      with:
-        ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
-
-    - name: Install build tools
-      run: |
-        brew install \
-          automake
-        cabal v1-install alex happy
-
-    - name: Build package
-      run: |
-        sudo mkdir -p /Library/Java/Home
-        sudo ln -s /usr/local/opt/openjdk/include /Library/Java/Home/include
-        make pkg
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: gf-${{ github.event.release.tag_name }}-macos
-        path: dist/gf-*.pkg
-        if-no-files-found: error
-    
-    - name: Rename package
-      run: |
-        mv dist/gf-*.pkg dist/gf-${{ github.event.release.tag_name }}-macos.pkg
-
-    - uses: actions/upload-release-asset@v1.0.2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ github.event.release.upload_url }}
-        asset_path: dist/gf-${{ github.event.release.tag_name }}-macos.pkg
-        asset_name: gf-${{ github.event.release.tag_name }}-macos.pkg
-        asset_content_type: application/octet-stream
-
-# ---
-
-  windows:
-    name: Build Windows package
-    strategy:
-      matrix:
-        ghc: ["8.6.5"]
-        cabal: ["2.4"]
-        os: ["windows-2019"]
-    runs-on: ${{ matrix.os }}
-
-    steps:
-    - uses: actions/checkout@v2
-
-    - name: Setup MSYS2
-      uses: msys2/setup-msys2@v2
-      with:
-        install: >-
-          base-devel
-          gcc
-          python-devel
-
-    - name: Prepare dist folder
-      shell: msys2 {0}
-      run: |
-        mkdir /c/tmp-dist
-        mkdir /c/tmp-dist/c
-        mkdir /c/tmp-dist/java
-        mkdir /c/tmp-dist/python
-
-    - name: Build C runtime
-      shell: msys2 {0}
-      run: |
-        cd src/runtime/c
-        autoreconf -i
-        ./configure
-        make
-        make install
-        cp /mingw64/bin/libpgf-0.dll /c/tmp-dist/c
-        cp /mingw64/bin/libgu-0.dll /c/tmp-dist/c
-
-    # JAVA_HOME_8_X64 = C:\hostedtoolcache\windows\Java_Adopt_jdk\8.0.292-10\x64
-    - name: Build Java bindings
-      shell: msys2 {0}
-      run: |
-        export JDKPATH=/c/hostedtoolcache/windows/Java_Adopt_jdk/8.0.292-10/x64
-        export PATH="${PATH}:${JDKPATH}/bin"
-        cd src/runtime/java
-        make \
-          JNI_INCLUDES="-I \"${JDKPATH}/include\" -I \"${JDKPATH}/include/win32\" -I \"/mingw64/include\" -D__int64=int64_t" \
-          WINDOWS_LDFLAGS="-L\"/mingw64/lib\" -no-undefined"
-        make install
-        cp .libs/msys-jpgf-0.dll /c/tmp-dist/java/jpgf.dll
-        cp jpgf.jar /c/tmp-dist/java
-
-    - name: Build Python bindings
-      shell: msys2 {0}
-      env:
-        EXTRA_INCLUDE_DIRS: /mingw64/include
-        EXTRA_LIB_DIRS: /mingw64/lib
-      run: |
-        cd src/runtime/python
-        python setup.py build
-        python setup.py install
-        cp /usr/lib/python3.9/site-packages/pgf* /c/tmp-dist/python
-
-    - name: Setup Haskell
-      uses: actions/setup-haskell@v1
-      id: setup-haskell-cabal
-      with:
-        ghc-version: ${{ matrix.ghc }}
-        cabal-version: ${{ matrix.cabal }}
-
-    - name: Install Haskell build tools
-      run: |
-        cabal install alex happy
-
-    - name: Build GF
-      run: |
-        cabal install --only-dependencies -fserver
-        cabal configure -fserver
-        cabal build
-        copy dist\build\gf\gf.exe C:\tmp-dist
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v2
-      with:
-        name: gf-${{ github.event.release.tag_name }}-windows
-        path: C:\tmp-dist\*
-        if-no-files-found: error
-
-    - name: Create archive
-      run: |
-        Compress-Archive C:\tmp-dist C:\gf-${{ github.event.release.tag_name }}-windows.zip
-    - uses: actions/upload-release-asset@v1.0.2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        upload_url: ${{ github.event.release.upload_url }}
-        asset_path: C:\gf-${{ github.event.release.tag_name }}-windows.zip
-        asset_name: gf-${{ github.event.release.tag_name }}-windows.zip
-        asset_content_type: application/zip

.github/workflows/build-majestic.yml

@@ -1,369 +0,0 @@
-name: Build majestic runtime
-
-on: push
-
-env:
-  LD_LIBRARY_PATH: /usr/local/lib
-
-jobs:
-
-  linux-runtime:
-    name: Runtime (Linux)
-    runs-on: ubuntu-latest
-    container:
-      image: quay.io/pypa/manylinux2014_x86_64:2024-01-08-eb135ed
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Build runtime
-      working-directory: ./src/runtime/c
-      run: |
-        autoreconf -i
-        ./configure
-        make
-        make install
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@v3
-      with:
-        name: libpgf-linux
-        path: |
-          /usr/local/lib/libpgf*
-          /usr/local/include/pgf
-
-  linux-haskell:
-    name: Haskell (Linux)
-    runs-on: ubuntu-latest
-    needs: linux-runtime
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Download artifact
-      uses: actions/download-artifact@v3
-      with:
-        name: libpgf-linux
-    - run: |
-        sudo mv lib/* /usr/local/lib/
-        sudo mv include/* /usr/local/include/
-
-    - name: Setup Haskell
-      uses: haskell/actions/setup@v2
-      with:
-        ghc-version: 8
-
-    - name: Install Haskell build tools
-      run: |
-        cabal v1-install alex happy
-
-    - name: build and test the runtime
-      working-directory: ./src/runtime/haskell
-      run: |
-        cabal v1-install --extra-lib-dirs=/usr/local/lib
-        cabal test --extra-lib-dirs=/usr/local/lib
-
-    - name: build the compiler
-      working-directory: ./src/compiler
-      run: |
-        cabal v1-install
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@master
-      with:
-        name: compiler-linux
-        path: |
-          ~/.cabal/bin/gf
-
-  linux-python:
-    name: Python (Linux)
-    runs-on: ubuntu-latest
-    needs: linux-runtime
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Download artifact
-      uses: actions/download-artifact@v3
-      with:
-        name: libpgf-linux
-
-    - name: Install cibuildwheel
-      run: |
-        python3 -m pip install git+https://github.com/joerick/cibuildwheel.git@main
-
-    - name: Install and test bindings
-      env:
-        CIBW_BEFORE_BUILD: cp -r lib/* /usr/lib/ && cp -r include/* /usr/include/
-        CIBW_TEST_REQUIRES: pytest
-        CIBW_TEST_COMMAND: "pytest {project}/src/runtime/python"
-        CIBW_SKIP: "pp* *i686 *musllinux_x86_64"
-      run: |
-        python3 -m cibuildwheel src/runtime/python --output-dir wheelhouse
-
-    - uses: actions/upload-artifact@master
-      with:
-        name: python-linux
-        path: ./wheelhouse
-
-#  linux-javascript:
-#    name: JavaScript (Linux)
-#    runs-on: ubuntu-latest
-#    needs: linux-runtime
-#
-#    steps:
-#    - uses: actions/checkout@v3
-#    - name: Download artifact
-#      uses: actions/download-artifact@master
-#      with:
-#        name: libpgf-linux
-#    - run: |
-#        sudo mv lib/* /usr/local/lib/
-#        sudo mv include/* /usr/local/include/
-#
-#    - name: Setup Node.js
-#      uses: actions/setup-node@v2
-#      with:
-#        node-version: '12'
-#
-#    - name: Install dependencies
-#      working-directory: ./src/runtime/javascript
-#      run: |
-#        npm ci
-#
-#    - name: Run testsuite
-#      working-directory: ./src/runtime/javascript
-#      run: |
-#        npm run test
-
-# ----------------------------------------------------------------------------
-
-  macos-runtime:
-    name: Runtime (macOS)
-    runs-on: macOS-11
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Install build tools
-      run: |
-        brew install \
-          autoconf \
-          automake \
-          libtool \
-
-    - name: Build runtime
-      working-directory: ./src/runtime/c
-      run: |
-        glibtoolize
-        autoreconf -i
-        ./configure
-        make
-        sudo make install
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@master
-      with:
-        name: libpgf-macos
-        path: |
-          /usr/local/lib/libpgf*
-          /usr/local/include/pgf
-
-  macos-haskell:
-    name: Haskell (macOS)
-    runs-on: macOS-11
-    needs: macos-runtime
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Download artifact
-      uses: actions/download-artifact@master
-      with:
-        name: libpgf-macos
-    - run: |
-        sudo mv lib/* /usr/local/lib/
-        sudo mv include/* /usr/local/include/
-
-    - name: Setup Haskell
-      uses: haskell/actions/setup@v2
-      with:
-        ghc-version: 8
-
-    - name: Build & run testsuite
-      working-directory: ./src/runtime/haskell
-      run: |
-        cabal test --extra-lib-dirs=/usr/local/lib
-
-  macos-python:
-    name: Python (macOS)
-    runs-on: macOS-11
-    needs: macos-runtime
-    env:
-      EXTRA_INCLUDE_DIRS: /usr/local/include
-      EXTRA_LIB_DIRS: /usr/local/lib
-      MACOSX_DEPLOYMENT_TARGET: 11.0
-  
-    steps:
-    - uses: actions/checkout@v3
-    - name: Download artifact
-      uses: actions/download-artifact@master
-      with:
-        name: libpgf-macos
-    - run: |
-        sudo mv lib/* /usr/local/lib/
-        sudo mv include/* /usr/local/include/
-
-    - name: Install cibuildwheel
-      run: |
-        python3 -m pip install git+https://github.com/joerick/cibuildwheel.git@main
-
-    - name: Install and test bindings
-      env:
-        CIBW_TEST_REQUIRES: pytest
-        CIBW_TEST_COMMAND: "pytest {project}/src/runtime/python"
-        CIBW_SKIP: "pp* cp36* cp37* cp38* cp39*"
-      run: |
-        python3 -m cibuildwheel src/runtime/python --output-dir wheelhouse
-
-    - uses: actions/upload-artifact@master
-      with:
-        name: python-macos
-        path: ./wheelhouse
-
-#  macos-javascript:
-#   name: JavaScript (macOS)
-#    runs-on: macOS-11
-#    needs: macos-runtime
-#
-#    steps:
-#    - uses: actions/checkout@v3
-#    - name: Download artifact
-#      uses: actions/download-artifact@master
-#      with:
-#        name: libpgf-macos
-#    - run: |
-#        sudo mv lib/* /usr/local/lib/
-#        sudo mv include/* /usr/local/include/
-#
-#    - name: Setup Node.js
-#      uses: actions/setup-node@v2
-#      with:
-#        node-version: '12'
-#
-#    - name: Install dependencies
-#      working-directory: ./src/runtime/javascript
-#      run: |
-#        npm ci
-#
-#    - name: Run testsuite
-#      working-directory: ./src/runtime/javascript
-#      run: |
-#        npm run test
-
-# ----------------------------------------------------------------------------
-
-  mingw64-runtime:
-    name: Runtime (MinGW64)
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    
-    - name: Setup MSYS2
-      uses: msys2/setup-msys2@v2
-      with:
-        msystem: MINGW64
-        install: >-
-          base-devel
-          autoconf
-          automake
-          libtool
-          mingw-w64-x86_64-toolchain
-          mingw-w64-x86_64-libtool
-
-    - name: Build runtime
-      shell: msys2 {0}
-      working-directory: ./src/runtime/c
-      run: |
-        autoreconf -i
-        ./configure
-        make
-        make install
-
-    - name: Upload artifact
-      uses: actions/upload-artifact@master
-      with:
-        name: libpgf-windows
-        path: |
-          ${{runner.temp}}/msys64/mingw64/bin/libpgf*
-          ${{runner.temp}}/msys64/mingw64/bin/libgcc_s_seh-1.dll
-          ${{runner.temp}}/msys64/mingw64/bin/libstdc++-6.dll
-          ${{runner.temp}}/msys64/mingw64/bin/libwinpthread-1.dll
-          ${{runner.temp}}/msys64/mingw64/lib/libpgf*
-          ${{runner.temp}}/msys64/mingw64/include/pgf
-
-  windows-python:
-    name: Python (Windows)
-    runs-on: windows-latest
-
-    steps:
-    - uses: actions/checkout@v3
-
-    - name: Setup Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.10'
-
-    - name: Install cibuildwheel
-      run: |
-        python3 -m pip install git+https://github.com/joerick/cibuildwheel.git@main
-
-    - name: Install and test bindings
-      env:
-        CIBW_TEST_REQUIRES: pytest
-        CIBW_TEST_COMMAND: "pytest   {project}\\src\\runtime\\python"
-        CIBW_SKIP: "pp* *-win32"
-      run: |
-        python3 -m cibuildwheel src\runtime\python --output-dir wheelhouse
-
-    - uses: actions/upload-artifact@master
-      with:
-        name: python-windows
-        path: ./wheelhouse
-
-  upload_pypi:
-    name: Upload to PyPI
-    needs: [linux-python, macos-python, windows-python]
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/majestic' && github.event_name == 'push'
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Python
-        uses: actions/setup-python@v3
-        with:
-          python-version: '3.x'
-
-      - name: Install twine
-        run: pip install twine
-
-      - uses: actions/download-artifact@master
-        with:
-          name: python-linux
-          path: ./dist
-
-      - uses: actions/download-artifact@master
-        with:
-          name: python-macos
-          path: ./dist
-
-      - uses: actions/download-artifact@master
-        with:
-          name: python-windows
-          path: ./dist
-
-      - name: Publish
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.pypi_majestic_password }}
-        run: |
-          (cd ./src/runtime/python && curl -I --fail https://pypi.org/project/$(python setup.py --name)/$(python setup.py --version)/) || twine upload --skip-existing dist/*

.github/workflows/build-python-package.yml

@@ -1,98 +0,0 @@
-name: Build & Publish Python Package
-
-# Trigger the workflow on push or pull request, but only for the master branch
-on:
-  pull_request:
-  push:
-    branches: [master]
-
-jobs:
-  build_wheels:
-    name: Build wheel on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: true
-      matrix:
-        os: [ubuntu-18.04, macos-10.15]
-
-    steps:
-    - uses: actions/checkout@v1
-
-    - uses: actions/setup-python@v1
-      name: Install Python
-      with:
-        python-version: '3.7'
-
-    - name: Install cibuildwheel
-      run: |
-        python -m pip install git+https://github.com/joerick/cibuildwheel.git@main
-
-    - name: Install build tools for OSX
-      if: startsWith(matrix.os, 'macos')
-      run: |
-        brew install automake
-
-    - name: Build wheels on Linux
-      if: startsWith(matrix.os, 'macos') != true
-      env:
-        CIBW_BEFORE_BUILD: cd src/runtime/c && autoreconf -i && ./configure && make && make install
-      run: |
-        python -m cibuildwheel src/runtime/python --output-dir wheelhouse
-
-    - name: Build wheels on OSX
-      if: startsWith(matrix.os, 'macos')
-      env:
-        CIBW_BEFORE_BUILD: cd src/runtime/c && glibtoolize && autoreconf -i && ./configure && make && make install
-      run: |
-        python -m cibuildwheel src/runtime/python --output-dir wheelhouse
-
-    - uses: actions/upload-artifact@v2
-      with:
-        path: ./wheelhouse
-
-  build_sdist:
-    name: Build source distribution
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/setup-python@v2
-        name: Install Python
-        with:
-          python-version: '3.7'
-
-      - name: Build sdist
-        run: cd src/runtime/python && python setup.py sdist
-
-      - uses: actions/upload-artifact@v2
-        with:
-          path: ./src/runtime/python/dist/*.tar.gz
-
-  upload_pypi:
-    name: Upload to PyPI
-    needs: [build_wheels, build_sdist]
-    runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/master' && github.event_name == 'push'
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: '3.x'
-
-      - name: Install twine
-        run: pip install twine
-
-      - uses: actions/download-artifact@v2
-        with:
-          name: artifact
-          path: ./dist
-
-      - name: Publish
-        env:
-          TWINE_USERNAME: __token__
-          TWINE_PASSWORD: ${{ secrets.pypi_password }}
-        run: |
-          (cd ./src/runtime/python && curl -I --fail https://pypi.org/project/$(python setup.py --name)/$(python setup.py --version)/) || twine upload dist/*

.gitignore

@@ -5,15 +5,7 @@
 *.jar
 *.gfo
 *.pgf
-*.ngf
-debian/.debhelper
-debian/debhelper-build-stamp
-debian/gf
-debian/gf.debhelper.log
-debian/gf.substvars
-debian/files
 dist/
-dist-newstyle/
 src/runtime/c/.libs/
 src/runtime/c/Makefile
 src/runtime/c/Makefile.in
@@ -47,8 +39,6 @@ src/runtime/c/sg/.dirstamp
 src/runtime/c/stamp-h1
 src/runtime/java/.libs/
 src/runtime/python/build/
-src/runtime/python/**/__pycache__/
-src/runtime/python/**/.pytest_cache/
 .cabal-sandbox
 cabal.sandbox.config
 .stack-work
@@ -56,16 +46,6 @@ DATA_DIR
 
 stack*.yaml.lock
 
-# Generated source files
-src/compiler/api/GF/Grammar/Lexer.hs
-src/compiler/api/GF/Grammar/Parser.hs
-src/compiler/api/PackageInfo_gf.hs
-src/compiler/api/Paths_gf.hs
-
-# Output files for test suite
-*.out
-gf-tests.html
-
 # Generated documentation (not exhaustive)
 demos/index-numbers.html
 demos/resourcegrammars.html

.travis.yml

@@ -0,0 +1,14 @@
+sudo: required
+
+language: c
+
+services:
+  - docker
+
+before_install:
+  - docker pull odanoburu/gf-src:3.9
+
+script:
+  - |
+    docker run --mount src="$(pwd)",target=/home/gfer,type=bind odanoburu/gf-src:3.9 /bin/bash -c "cd /home/gfer/src/runtime/c &&
+    autoreconf -i && ./configure && make && make install ; cd /home/gfer ; cabal install -fserver -fc-runtime --extra-lib-dirs='/usr/local/lib'"

CHANGELOG.md

@@ -1,11 +0,0 @@
-### New since 3.11 (WIP)
-
-- Added a changelog!
-
-### 3.11
-
-See <https://www.grammaticalframework.org/download/release-3.11.html>
-
-### 3.10
-
-See <https://www.grammaticalframework.org/download/release-3.10.html>

Makefile

@@ -1,37 +1,31 @@
-.PHONY: all build install doc clean html deb pkg bintar sdist
+.PHONY: all build install doc clean gf html deb pkg bintar sdist
 
 # This gets the numeric part of the version from the cabal file
 VERSION=$(shell sed -ne "s/^version: *\([0-9.]*\).*/\1/p" gf.cabal)
 
-# Check if stack is installed
-STACK=$(shell if hash stack 2>/dev/null; then echo "1"; else echo "0"; fi)
+all: build
 
-ifeq ($(STACK),1)
-  CMD=stack
-else
-  CMD=cabal
-  CMD_OPT="--force-reinstalls"
-endif
+dist/setup-config: gf.cabal Setup.hs WebSetup.hs
+	cabal configure
 
-all: src/runtime/c/libpgf.la
-	${CMD} install gf
+build: dist/setup-config
+	cabal build
 
-src/runtime/c/libpgf.la: src/runtime/c/Makefile
-	(cd src/runtime/c; make; sudo make install)
-
-src/runtime/c/Makefile: src/runtime/c/Makefile.in src/runtime/c/configure
-	(cd src/runtime/c; ./configure)
-
-src/runtime/c/Makefile.in src/runtime/c/configure: src/runtime/c/configure.ac src/runtime/c/Makefile.am
-	(cd src/runtime/c; autoreconf -i)
+install:
+	cabal copy
+	cabal register
 
 doc:
-	${CMD} haddock
+	cabal haddock
 
 clean:
-	${CMD} clean
+	cabal clean
 	bash bin/clean_html
 
+gf:
+	cabal build rgl-none
+	strip dist/build/gf/gf
+
 html::
 	bash bin/update_html
 
@@ -41,7 +35,7 @@ html::
 deb:
 	dpkg-buildpackage -b -uc
 
-# Make a macOS installer package
+# Make an OS X Installer package
 pkg:
 	FMT=pkg bash bin/build-binary-dist.sh
 
@@ -54,6 +48,6 @@ bintar:
 
 # Make a source tar.gz distribution using git to make sure that everything is included.
 # We put the distribution in dist/ so it is removed on `make clean`
-# sdist:
-# 	test -d dist || mkdir dist
-# 	git archive --format=tar.gz --output=dist/gf-${VERSION}.tar.gz HEAD
+sdist:
+	test -d dist || mkdir dist
+	git archive --format=tar.gz --output=dist/gf-${VERSION}.tar.gz HEAD

README.md

@@ -1,8 +1,8 @@
-![GF Logo](https://www.grammaticalframework.org/doc/Logos/gf1.svg)
+![GF Logo](doc/Logos/gf1.svg)
 
 # Grammatical Framework (GF)
 
-![Build majestic runtime](https://github.com/GrammaticalFramework/gf-core/actions/workflows/build-majestic.yml/badge.svg?branch=majestic)
+[![Build Status](https://travis-ci.org/GrammaticalFramework/gf-core.svg?branch=master)](https://travis-ci.org/GrammaticalFramework/gf-core)
 
 The Grammatical Framework is a grammar formalism based on type theory.
 It consists of:
@@ -32,44 +32,13 @@ GF particularly addresses four aspects of grammars:
 
 ## Compilation and installation
 
-1. First, you need to install the C Runtime. 
-```Bash
-cd src/runtime/c
+The simplest way of installing GF is with the command:
 ```
-Then follow the instructions in the [README.md](src/runtime/c/README.md) in that folder.
-
-2. When the C runtime is installed, you should set up the Haskell runtime
-```Bash
-cd ../haskell
-runghc Setup.hs configure 
-runghc Setup.hs build
-sudo runghc Setup.hs install
-```
-If the above commands fail because of missing dependencies, then you must install those first. Use something along the lines:
-```Bash
-cabal v1-install random --global
-```
-the same applies for all other dependecies needed here or bellow.
-
-If you use macOS, you might run into problems with installation under ``/usr/lib``, and you should **first** specify the variable for the library path: 
-```Bash
-export DYLD_LIBRARY_PATH=/usr/local/lib
-```
-and then you run following commands:
-```Bash
-runghc Setup.hs configure --prefix=/usr/local
-runghc Setup.hs build
-sudo DYLD_LIBRARY_PATH=/usr/local/lib runghc Setup.hs install
-```
-3. Then you need to setup the compiler: 
-```Bash
-cd ../../compiler/           
-runghc Setup.hs configure
-runghc Setup.hs build
-sudo DYLD_LIBRARY_PATH=/usr/local/lib runghc Setup.hs install
+cabal install
 ```
 
-For more information, including links to precompiled binaries, see the [download page](https://www.grammaticalframework.org/download/index.html).
+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).
 
 ## About this repository
 

RELEASE.md

@@ -1,69 +0,0 @@
-# GF Core releases
-
-**Note:**
-The RGL is now released completely separately from GF Core.
-See the [RGL's RELEASE.md](https://github.com/GrammaticalFramework/gf-rgl/blob/master/RELEASE.md).
-
-## Creating a new release
-
-### 1. Prepare the repository
-
-**Web pages**
-
-1. Create `download/index-X.Y.md` with installation instructions.
-2. Create `download/release-X.Y.md` with changelog information.
-3. Update `download/index.html` to redirect to the new version.
-4. Add announcement in news section in `index.html`.
-
-**Version numbers**
-
-1. Update version number in `gf.cabal` (ommitting `-git` suffix).
-2. Add a new line in `debian/changelog`.
-
-### 2. Create GitHub release
-
-1. When the above changes are committed to the `master` branch in the repository
-  and pushed, check that all CI workflows are successful (fixing as necessary):
-  - <https://github.com/GrammaticalFramework/gf-core/actions>
-  - <https://travis-ci.org/github/GrammaticalFramework/gf-core>
-2. Create a GitHub release [here](https://github.com/GrammaticalFramework/gf-core/releases/new):
-  - Tag version format `RELEASE-X.Y`
-  - Title: "GF X.Y"
-  - Description: mention major changes since last release
-3. Publish the release to trigger the building of the binary packages (below).
-
-### 3. Binary packages
-
-The binaries will be built automatically by GitHub Actions when the release is created,
-but the generated _artifacts_ must be manually attached to the release as _assets_.
-
-1. Go to the [actions page](https://github.com/GrammaticalFramework/gf-core/actions) and click "Build Binary Packages" under _Workflows_.
-2. Choose the workflow run corresponding to the newly created release.
-3. Download the artifacts locally. Extract the Ubuntu and macOS ones to get the `.deb` and `.pkg` files.
-4. Go back to the [releases page](https://github.com/GrammaticalFramework/gf-core/releases) and click to edit the release information.
-5. Add the downloaded artifacts as release assets, giving them names with format `gf-X.Y-PLATFORM.EXT` (e.g. `gf-3.11-macos.pkg`).
-
-### 4. Upload to Hackage
-
-In order to do this you will need to be added the [GF maintainers](https://hackage.haskell.org/package/gf/maintainers/) on Hackage.
-
-1. Run `stack sdist --test-tarball` and address any issues.
-2. Upload the package, either:
-    1. **Manually**: visit <https://hackage.haskell.org/upload> and upload the file generated by the previous command.
-    2. **via Stack**: `stack upload . --candidate`
-3. After testing the candidate, publish it:
-    1. **Manually**: visit <https://hackage.haskell.org/package/gf-X.Y.Z/candidate/publish>
-    1. **via Stack**: `stack upload .`
-4. If the documentation-building fails on the Hackage server, do:
-```
-cabal v2-haddock --builddir=dist/docs --haddock-for-hackage --enable-doc
-cabal upload --documentation dist/docs/*-docs.tar.gz
-```
-
-## Miscellaneous
-
-### What is the tag `GF-3.10`?
-
-For GF 3.10, the Core and RGL repositories had already been separated, however
-the binary packages still included the RGL. `GF-3.10` is a tag that was created
-in both repositories ([gf-core](https://github.com/GrammaticalFramework/gf-core/releases/tag/GF-3.10) and [gf-rgl](https://github.com/GrammaticalFramework/gf-rgl/releases/tag/GF-3.10)) to indicate which versions of each went into the binaries.

ServerInstructions.md

@@ -1,18 +0,0 @@
-# GF server installation
-
-1. First make sure your compiler is installed with a flag server: 
-
-```bash
-cd gf-core/src/compiler/           
-runghc Setup.hs configure -f servef
-runghc Setup.hs build
-sudo runghc Setup.hs install
-```
-
-1. You can test it now by running: 
-
-```bash
-gf -server
-```
-
-It will also show the root directory (`ROOT_DIR`)

Setup.hs

@@ -0,0 +1,82 @@
+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(..))
+import Distribution.PackageDescription(PackageDescription(..),emptyHookedBuildInfo)
+import Distribution.Simple.BuildPaths(exeExtension)
+import System.FilePath((</>),(<.>))
+
+import WebSetup
+
+-- | Notice about RGL not built anymore
+noRGLmsg :: IO ()
+noRGLmsg = putStrLn "Notice: the RGL is not built as part of GF anymore. See https://github.com/GrammaticalFramework/gf-rgl"
+
+main :: IO ()
+main = defaultMainWithHooks simpleUserHooks
+  { preBuild  = gfPreBuild
+  , postBuild = gfPostBuild
+  , preInst   = gfPreInst
+  , postInst  = gfPostInst
+  , postCopy  = gfPostCopy
+  , sDistHook = gfSDist
+  }
+  where
+    gfPreBuild args  = gfPre args . buildDistPref
+    gfPreInst args = gfPre args . installDistPref
+
+    gfPre args distFlag = do
+      return emptyHookedBuildInfo
+
+    gfPostBuild args flags pkg lbi = do
+      noRGLmsg
+      let gf = default_gf lbi
+      buildWeb gf flags (pkg,lbi)
+
+    gfPostInst args flags pkg lbi = do
+      noRGLmsg
+      saveInstallPath args flags (pkg,lbi)
+      installWeb (pkg,lbi)
+
+    gfPostCopy args flags  pkg lbi = do
+      noRGLmsg
+      saveCopyPath args flags (pkg,lbi)
+      copyWeb flags (pkg,lbi)
+
+    -- `cabal sdist` will not make a proper dist archive, for that see `make sdist`
+    -- However this function should exit quietly to allow building gf in sandbox
+    gfSDist pkg lbi hooks flags = do
+      return ()
+
+saveInstallPath :: [String] -> InstallFlags -> (PackageDescription, LocalBuildInfo) -> IO ()
+saveInstallPath args flags bi = do
+  let
+    dest = NoCopyDest
+    dir = datadir (uncurry absoluteInstallDirs bi dest)
+  writeFile dataDirFile dir
+
+saveCopyPath :: [String] -> CopyFlags -> (PackageDescription, LocalBuildInfo) -> IO ()
+saveCopyPath args flags bi = do
+  let
+    dest = case copyDest flags of
+      NoFlag -> NoCopyDest
+      Flag d -> d
+    dir = datadir (uncurry absoluteInstallDirs bi dest)
+  writeFile dataDirFile dir
+
+-- | Name of file where installation's data directory is recording
+-- This is a last-resort way in which the seprate RGL build script
+-- can determine where to put the compiled RGL files
+dataDirFile :: String
+dataDirFile = "DATA_DIR"
+
+-- | Get path to locally-built gf
+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

@@ -0,0 +1,141 @@
+module WebSetup(buildWeb,installWeb,copyWeb,numJobs,execute) where
+
+import System.Directory(createDirectoryIfMissing,copyFile,doesDirectoryExist,doesFileExist)
+import System.FilePath((</>),dropExtension)
+import System.Process(rawSystem)
+import System.Exit(ExitCode(..))
+import Distribution.Simple.Setup(BuildFlags(..),Flag(..),CopyFlags(..),CopyDest(..),copyDest)
+import Distribution.Simple.LocalBuildInfo(LocalBuildInfo(..),datadir,buildDir,absoluteInstallDirs)
+import Distribution.PackageDescription(PackageDescription(..))
+
+{-
+   To test the GF web services, the minibar and the grammar editor, use
+   "cabal install" (or "runhaskell Setup.hs install") to install gf as usual.
+   Then start the server with the command "gf -server" and open
+   http://localhost:41296/ in your web browser (Firefox, Safari, Opera or
+   Chrome). The example grammars listed below will be available in the minibar.
+-}
+
+{-
+  Update 2018-07-04
+
+  The example grammars have now been removed from the GF repository.
+  This script will look for them in ../gf-contrib and build them from there if possible.
+  If not, the user will be given a message and nothing is build or copied.
+  (Unfortunately cabal install seems to hide all messages from stdout,
+  so users won't see this message unless they check the log.)
+-}
+
+example_grammars :: [(String, String, [String])] -- [(pgf, subdir, source modules)]
+example_grammars =
+   [("Letter.pgf","letter",letterSrc)
+   ,("Foods.pgf","foods",foodsSrc)
+   ,("Phrasebook.pgf","phrasebook",phrasebookSrc)
+   ]
+  where
+    foodsSrc = ["Foods"++lang++".gf"|lang<-foodsLangs]
+    foodsLangs = words "Afr Amh Bul Cat Cze Dut Eng Epo Fin Fre Ger Gle Heb Hin Ice Ita Jpn Lav Mlt Mon Nep Pes Por Ron Spa Swe Tha Tsn Tur Urd"
+
+    phrasebookSrc = ["Phrasebook"++lang++".gf"|lang<-phrasebookLangs]
+    phrasebookLangs = words "Bul Cat Chi Dan Dut Eng Lav Hin Nor Spa Swe Tha" -- only fastish languages
+
+    letterSrc = ["Letter"++lang++".gf"|lang<-letterLangs]
+    letterLangs = words "Eng Fin Fre Heb Rus Swe"
+
+contrib_dir :: FilePath
+contrib_dir = ".."</>"gf-contrib"
+
+buildWeb :: String -> BuildFlags -> (PackageDescription, LocalBuildInfo) -> IO ()
+buildWeb gf flags (pkg,lbi) = do
+  contrib_exists <- doesDirectoryExist contrib_dir
+  if contrib_exists
+  then mapM_ build_pgf example_grammars
+  else putStr $ unlines
+    [ "Example grammars are no longer included in the main GF repository, but have moved to gf-contrib."
+    , "If you want these example grammars to be built, clone this repository in the same top-level directory as GF:"
+    , "https://github.com/GrammaticalFramework/gf-contrib.git"
+    ]
+  where
+    gfo_dir = buildDir lbi </> "examples"
+
+    build_pgf :: (String, String, [String]) -> IO Bool
+    build_pgf (pgf,subdir,src) =
+      do createDirectoryIfMissing True tmp_dir
+         putStrLn $ "Building "++pgf
+         execute gf args
+      where
+        tmp_dir = gfo_dir</>subdir
+        dir = contrib_dir</>subdir
+        dest = NoCopyDest
+        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,
+                  "--name="++dropExtension pgf,
+                  "--output-dir="++gfo_dir]
+               ++[dir</>file|file<-src]
+
+installWeb :: (PackageDescription, LocalBuildInfo) -> IO ()
+installWeb = setupWeb NoCopyDest
+
+copyWeb :: CopyFlags -> (PackageDescription, LocalBuildInfo) -> IO ()
+copyWeb flags = setupWeb dest
+  where
+    dest = case copyDest flags of
+             NoFlag -> NoCopyDest
+             Flag d -> d
+
+setupWeb :: CopyDest -> (PackageDescription, LocalBuildInfo) -> IO ()
+setupWeb dest (pkg,lbi) = do
+  mapM_ (createDirectoryIfMissing True) [grammars_dir,cloud_dir]
+  contrib_exists <- doesDirectoryExist contrib_dir
+  if contrib_exists
+  then mapM_ copy_pgf example_grammars
+  else return () -- message already displayed from buildWeb
+  copyGFLogo
+  where
+    grammars_dir = www_dir </> "grammars"
+    cloud_dir = www_dir </> "tmp" -- hmm
+    logo_dir = www_dir </> "Logos"
+    www_dir = datadir (absoluteInstallDirs pkg lbi dest) </> "www"
+    gfo_dir = buildDir lbi </> "examples"
+
+    copy_pgf :: (String, String, [String]) -> IO ()
+    copy_pgf (pgf,subdir,_) =
+      do let src = gfo_dir </> pgf
+         let dst = grammars_dir </> pgf
+         ex <- doesFileExist src
+         if ex then do putStrLn $ "Installing "++dst
+                       copyFile src dst
+               else putStrLn $ "Not installing "++dst
+
+    gf_logo = "gf0.png"
+
+    copyGFLogo =
+      do createDirectoryIfMissing True logo_dir
+         copyFile ("doc"</>"Logos"</>gf_logo) (logo_dir</>gf_logo)
+
+-- | Run an arbitrary system command, returning False on failure
+execute :: String -> [String] -> IO Bool
+execute command args =
+  do let cmdline = command ++ " " ++ unwords (map showArg args)
+     e <- rawSystem command args
+     case e of
+       ExitSuccess   -> return True
+       ExitFailure i -> do putStrLn $ "Ran: " ++ cmdline
+                           putStrLn $ command++" exited with exit code: " ++ show i
+                           return False
+  where
+    showArg arg = if ' ' `elem` arg then "'" ++ arg ++ "'" else arg
+
+-- | This function is used to enable parallel compilation of the RGL and example grammars
+numJobs :: BuildFlags -> [String]
+numJobs flags =
+    if null n
+    then ["-j","+RTS","-A20M","-N","-RTS"]
+    else ["-j="++n,"+RTS","-A20M","-N"++n,"-RTS"]
+  where
+    -- buildNumJobs is only available in Cabal>=1.20
+    n = case buildNumJobs flags of
+          Flag mn | mn/=Just 1-> maybe "" show mn
+          _ -> ""

bin/build-binary-dist.sh

@@ -1,18 +1,15 @@
 #! /bin/bash
 
-### This script builds a binary distribution of GF from source.
-### It assumes that you have Haskell and Cabal installed.
-### Two binary package formats are supported (specified with the FMT env var):
-### - plain tar files (.tar.gz)
-### - macOS installer packages (.pkg)
+### 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.
+### Two binary package formats are supported: plain tar files (.tar.gz) and
+### OS X Installer packages (.pkg).
 
 os=$(uname)     # Operating system name (e.g. Darwin or Linux)
 hw=$(uname -m)  # Hardware name (e.g. i686 or x86_64)
 
-cabal="cabal v1-" # Cabal >= 2.4
-# cabal="cabal " # Cabal <= 2.2
-
-## Get GF version number from Cabal file
+# GF version number:
 ver=$(grep -i ^version: gf.cabal | sed -e 's/version://' -e 's/ //g')
 
 name="gf-$ver"
@@ -32,7 +29,6 @@ set -x                             # print commands before executing them
 pushd src/runtime/c
 bash setup.sh configure --prefix="$prefix"
 bash setup.sh build
-bash setup.sh install prefix="$prefix" # hack required for GF build on macOS
 bash setup.sh install prefix="$destdir$prefix"
 popd
 
@@ -42,11 +38,11 @@ if which >/dev/null python; then
     EXTRA_INCLUDE_DIRS="$extrainclude" EXTRA_LIB_DIRS="$extralib" python setup.py build
     python setup.py install --prefix="$destdir$prefix"
     if [ "$fmt" == pkg ] ; then
-        # A hack for Python on macOS to find the PGF modules
-        pyver=$(ls "$destdir$prefix/lib" | sed -n 's/^python//p')
-        pydest="$destdir/Library/Python/$pyver/site-packages"
-        mkdir -p "$pydest"
-        ln "$destdir$prefix/lib/python$pyver/site-packages"/pgf* "$pydest"
+	# A hack for Python on OS X to find the PGF modules
+	pyver=$(ls "$destdir$prefix/lib" | sed -n 's/^python//p')
+	pydest="$destdir/Library/Python/$pyver/site-packages"
+	mkdir -p "$pydest"
+	ln "$destdir$prefix/lib/python$pyver/site-packages"/pgf* "$pydest"
     fi
     popd
 else
@@ -57,42 +53,52 @@ fi
 if which >/dev/null javac && which >/dev/null jar ; then
     pushd src/runtime/java
     rm -f libjpgf.la # In case it contains the wrong INSTALL_PATH
-    if make CFLAGS="-I$extrainclude -L$extralib" INSTALL_PATH="$prefix"
+    if make CFLAGS="-I$extrainclude -L$extralib" INSTALL_PATH="$prefix/lib"
     then
-        make INSTALL_PATH="$destdir$prefix" install
+	make INSTALL_PATH="$destdir$prefix/lib" install
     else
-        echo "Skipping the Java binding because of errors"
+	echo "*** Skipping the Java binding because of errors"
     fi
     popd
 else
     echo "Java SDK is not installed, so the Java binding will not be included"
 fi
 
-## To find dynamic C run-time libraries when building GF below
-export DYLD_LIBRARY_PATH="$extralib" LD_LIBRARY_PATH="$extralib"
-
 ## 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}build
+cabal install -w "$ghc" --only-dependencies -fserver -fc-runtime $extra
+cabal configure -w "$ghc" --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"
+cabal copy --destdir="$destdir"
 libdir=$(dirname $(find "$destdir" -name PGF.hi))
-${cabal}register --gen-pkg-config="$libdir/gf-$ver.conf"
+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
-        tar --directory "$destdir/$prefix" --gzip --create --file "dist/$targz" .
-        echo "Created $targz"
-        ;;
+	targz="$name-bin-$hw-$os.tar.gz"     # the final tar file
+	tar -C "$destdir/$prefix" -zcf "dist/$targz" .
+	echo "Created $targz, consider renaming it to something more user friendly"
+	;;
     pkg)
-        pkg=$name.pkg
-        pkgbuild --identifier org.grammaticalframework.gf.pkg --version "$ver" --root "$destdir" --install-location / dist/$pkg
-        echo "Created $pkg"
+	pkg=$name.pkg
+	pkgbuild --identifier org.grammaticalframework.gf.pkg --version "$ver" --root "$destdir" --install-location / dist/$pkg
+	echo "Created $pkg"
 esac
 
-## Cleanup
 rm -r "$destdir"

bin/template.html

@@ -82,10 +82,9 @@ $body$
           <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$/doc/gf-video-tutorials.html">Video Tutorials</a></li>
           <li><a href="$rel-root$/download"><strong>Download GF</strong></a></li>
         </ul>
       </div>

bin/update_html

@@ -147,7 +147,7 @@ else
     fi
   done
   find . -name '*.md' | while read file ; do
-    if [[ "$file" == *"README.md" ]] || [[ "$file" == *"RELEASE.md" ]] ; then continue ; fi
+    if [[ "$file" == *"README.md" ]] ; then continue ; fi
     html="${file%.md}.html"
     if [ "$file" -nt "$html" ] || [ "$template" -nt "$html" ] ; then
       render_md_html "$file" "$html"

debian/changelog

@@ -1,15 +1,3 @@
-gf (3.11) bionic focal; urgency=low
-
-  * GF 3.11
-
- -- Inari Listenmaa <inari@digitalgrammars.com>  Sun, 25 Jul 2021 10:27:40 +0800
-
-gf (3.10.4-1) xenial bionic cosmic; urgency=low
-
-  * GF 3.10.4
-
- -- Thomas Hallgren <hallgren@chalmers.se>  Fri, 18 Nov 2019 15:00:00 +0100
-
 gf (3.10.3-1) xenial bionic cosmic; urgency=low
 
   * GF 3.10.3

debian/control

@@ -3,14 +3,14 @@ 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
+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
 Homepage: http://www.grammaticalframework.org/
 
 Package: gf
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Tools for GF, a grammar formalism based on type theory
- Grammatical Framework (GF) is a grammar formalism based on type theory.
+ Grammatical Framework (GF) is a grammar formalism based on type theory. 
  It consists of a special-purpose programming language,
  a compiler of the language, and a generic grammar processor.
  .

debian/rules

@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-%:
+%: 
 	+dh $@
 
 #dh_shlibdeps has a problem finding which package some of the Haskell
@@ -16,23 +16,27 @@ override_dh_shlibdeps:
 override_dh_auto_configure:
 	cd src/runtime/c && bash setup.sh configure --prefix=/usr
 	cd src/runtime/c && bash setup.sh build
-	cabal v1-update
-	cabal v1-install --only-dependencies
-	cabal v1-configure --prefix=/usr -fserver -fc-runtime --extra-lib-dirs=$(CURDIR)/src/runtime/c/.libs --extra-include-dirs=$(CURDIR)/src/runtime/c
+	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
+	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 v1-build
+	-$(SET_LDL) cabal build # builds gf, fails to build example grammars
+	export $(SET_LDL); 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
+	make html
 
 override_dh_auto_install:
-	$(SET_LDL) cabal v1-copy --destdir=$(CURDIR)/debian/gf
+	$(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 install
+	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:

doc/errors/gluing.md

@@ -1,27 +0,0 @@
-## unsupported token gluing `foo + bar`
-
-There was a problem in an expression using +, e.g. `foo + bar`.
-This can be due to two causes, check which one applies in your case.
-
-1. You are trying to use + on runtime arguments. Even if you are using
-`foo + bar` in an oper, make sure that the oper isn't called in a
-linearization that takes arguments. Both of the following are illegal:
-
-    lin Test foo bar = foo.s + bar.s          -- explicit + in a lin
-    lin Test foo bar = opWithPlus foo bar     -- the oper uses +
-
-2. One of the arguments in `foo + bar` is a bound variable
-from pattern matching a string, but the cases are non-exhaustive.
-Example:
-    case "test" of {
-      x + "a" => x + "b"   -- no applicable case for "test", so x = ???
-    } ;
-
-You can fix this by adding a catch-all case in the end:
-    { x + "a" => x + "b" ;
-      _       => "default case" } ;
-
-3. If neither applies to your problem, submit a bug report and we
-will update the error message and this documentation.
-
-    https://github.com/GrammaticalFramework/gf-core/issues

doc/gf-developers-old-cabal.t2t

@@ -1,201 +0,0 @@
-GF Developer's Guide: Old installation instructions with Cabal
-
-
-This page contains the old installation instructions from the [Developer's Guide ../doc/gf-developers.html].
-We recommend Stack as a primary installation method, because it's easier for a Haskell beginner, and we want to keep the main instructions short.
-But if you are an experienced Haskeller and want to keep using Cabal, here are the old instructions using ``cabal install``.
-
-Note that some of these instructions may be outdated. Other parts may still be useful.
-
-== Compilation from source with Cabal ==
-
-The build system of GF is based on //Cabal//, which is part of the
-Haskell Platform, so no extra steps are needed to install it. In the simplest
-case, all you need to do to compile and install GF, after downloading the
-source code as described above, is
-
-```
-$ cabal install
-```
-
-This will automatically download any additional Haskell libraries needed to
-build GF. If this is the first time you use Cabal, you might need to run
-``cabal update`` first, to update the list of available libraries.
-
-If you want more control, the process can also be split up into the usual
-//configure//, //build// and //install// steps.
-
-=== Configure ===
-
-During the configuration phase Cabal will check that you have all
-necessary tools and libraries needed for GF. The configuration is
-started by the command:
-
-```
-$ cabal configure
-```
-
-If you don't see any error message from the above command then you
-have everything that is needed for GF. You can also add the option
-``-v`` to see more details about the configuration.
-
-You can use ``cabal configure --help`` to get a list of configuration options.
-
-=== Build ===
-
-The build phase does two things. First it builds the GF compiler from
-the Haskell source code and after that it builds the GF Resource Grammar
-Library using the already build compiler.  The simplest command is:
-
-```
-$ cabal build
-```
-
-Again you can add the option ``-v`` if you want to see more details.
-
-==== Parallel builds ====
-
-If you have Cabal>=1.20 you can enable parallel compilation by using
-
-```
-$ cabal build -j
-```
-
-or by putting a line
-```
-jobs: $ncpus
-```
-in your ``.cabal/config`` file. Cabal
-will pass this option to GHC when building the GF compiler, if you
-have GHC>=7.8.
-
-Cabal also passes ``-j`` to GF to enable parallel compilation of the
-Resource Grammar Library. This is done unconditionally to avoid
-causing problems for developers with Cabal<1.20. You can disable this
-by editing the last few lines in ``WebSetup.hs``.
-
-=== Install ===
-
-After you have compiled GF you need to install the executable and libraries
-to make the system usable.
-
-```
-$ cabal copy
-$ cabal register
-```
-
-This command installs the GF compiler for a single user, in the standard
-place used by Cabal.
-On Linux and Mac this could be ``$HOME/.cabal/bin``.
-On Mac it could also be ``$HOME/Library/Haskell/bin``.
-On Windows this is ``C:\Program Files\Haskell\bin``.
-
-The compiled GF Resource Grammar Library will be installed
-under the same prefix, e.g. in
-``$HOME/.cabal/share/gf-3.3.3/lib`` on Linux and
-in ``C:\Program Files\Haskell\gf-3.3.3\lib`` on Windows.
-
-If you want to install in some other place then use the ``--prefix``
-option during the configuration phase.
-
-=== Clean ===
-
-Sometimes you want to clean up the compilation and start again from clean
-sources. Use the clean command for this purpose:
-
-```
-$ cabal clean
-```
-
-
-%=== SDist ===
-%
-%You can use the command:
-%
-%% This does *NOT* include everything that is needed // TH 2012-08-06
-%```
-%$ cabal sdist
-%```
-%
-%to prepare archive with all source codes needed to compile GF.
-
-=== Known problems with Cabal ===
-
-Some versions of Cabal (at least version 1.16) seem to have a bug that can
-cause the following error:
-
-```
-Configuring gf-3.x...
-setup: Distribution/Simple/PackageIndex.hs:124:8-13: Assertion failed
-```
-
-The exact cause of this problem is unclear, but it seems to happen
-during the configure phase if the same version of GF is already installed,
-so a workaround is to remove the existing installation with
-
-```
-ghc-pkg unregister gf
-```
-
-You can check with ``ghc-pkg list gf`` that it is gone.
-
-== Compilation with make ==
-
-If you feel more comfortable with Makefiles then there is a thin Makefile
-wrapper arround Cabal for you. If you just type:
-```
-$ make
-```
-the configuration phase will be run automatically if needed and after that
-the sources will be compiled.
-
-%% cabal build rgl-none does not work with recent versions of Cabal
-%If you don't want to compile the resource library
-%every time then you can use:
-%```
-%$ make gf
-%```
-
-For installation use:
-```
-$ make install
-```
-For cleaning:
-```
-$ make clean
-```
-%and to build source distribution archive run:
-%```
-%$ make sdist
-%```
-
-
-== Partial builds of RGL ==
-
-**NOTE**: The following doesn't work with recent versions of ``cabal``. //(This comment was left in 2015, so make your own conclusions.)//
-%% // TH 2015-06-22
-
-%Sometimes you just want to work on the GF compiler and don't want to
-%recompile the resource library after each change. In this case use
-%this extended command:
-
-%```
-%$ cabal build rgl-none
-%```
-
-The resource grammar library can be compiled in two modes: with present
-tense only and with all tenses. By default it is compiled with all
-tenses. If you want to use the library with only present tense you can
-compile it in this special mode with the command:
-
-```
-$ cabal build present
-```
-
-You could also control which languages you want to be recompiled by
-adding the option ``langs=list``. For example the following command
-will compile only the English and the Swedish language:
-
-```
-$ cabal build langs=Eng,Swe
-```

doc/gf-developers.t2t

@@ -1,6 +1,6 @@
 GF Developers Guide
 
-2021-07-15
+2018-07-26
 
 %!options(html): --toc
 
@@ -15,287 +15,386 @@ you are a GF user who just wants to download and install GF
 == Setting up your system for building GF ==
 
 To build GF from source you need to install some tools on your
-system: the Haskell build tool //Stack//, the version control software //Git// and the //Haskeline// library.
+system: the //Haskell Platform//, //Git// and the //Haskeline library//.
 
-%**On Linux** the best option is to install the tools via the standard
-%software distribution channels, i.e. by using the //Software Center//
-%in Ubuntu or the corresponding tool in other popular Linux distributions.
+**On Linux** the best option is to install the tools via the standard
+software distribution channels, i.e. by using the //Software Center//
+in Ubuntu or the corresponding tool in other popular Linux distributions.
+Or, from a Terminal window, the following command should be enough:
 
-%**On Mac OS and Windows**, the tools can be downloaded from their respective
-%web sites, as described below.
-
-=== Stack ===
-The primary installation method is via //Stack//.
-(You can also use Cabal, but we recommend Stack to those who are new to Haskell.)
-
-To install Stack:
-
-- **On Linux and Mac OS**, do either
-
-    ``$ curl -sSL https://get.haskellstack.org/ | sh``
-
-  or
-
-    ``$ wget -qO- https://get.haskellstack.org/ | sh``
+- On Ubuntu: ``sudo apt-get install haskell-platform git libghc6-haskeline-dev``
+- On Fedora: ``sudo dnf install haskell-platform git ghc-haskeline-devel``
 
 
-- **On other operating systems**, see the [installation guide https://docs.haskellstack.org/en/stable/install_and_upgrade].
+**On Mac OS and Windows**, the tools can be downloaded from their respective
+web sites, as described below.
 
+=== The Haskell Platform ===
 
-%If you already have Stack installed, upgrade it to the latest version by running: ``stack upgrade``
+GF is written in Haskell, so first of all you need
+the //Haskell Platform//, e.g. version 8.0.2 or 7.10.3. Downloads
+and installation instructions are available from here:
 
+    http://hackage.haskell.org/platform/
+
+Once you have installed the Haskell Platform, open a terminal
+(Command Prompt on Windows) and try to execute the following command:
+```
+$ ghc --version
+```
+This command should show you which version of GHC you have. If the installation
+of the Haskell Platform	 was successful you should see a message like:
+
+```
+The Glorious Glasgow Haskell Compilation System, version 8.0.2
+```
+
+Other required tools included in the Haskell Platform are
+[Cabal http://www.haskell.org/cabal/],
+[Alex http://www.haskell.org/alex/]
+and
+[Happy http://www.haskell.org/happy/].
 
 === Git ===
 
-To get the GF source code, you also need //Git//, a distributed version control system.
+To get the GF source code, you also need //Git//.
+//Git// is a distributed version control system, see
+https://git-scm.com/downloads for more information.
 
-- **On Linux**, the best option is to install the tools via the standard
-software distribution channels:
-
-  - On Ubuntu: ``sudo apt-get install git-all``
-  - On Fedora: ``sudo dnf install git-all``
-
-
-- **On other operating systems**, see
-https://git-scm.com/book/en/v2/Getting-Started-Installing-Git for installation.
-
-
-
-=== Haskeline ===
+=== The haskeline library ===
 
 GF uses //haskeline// to enable command line editing in the GF shell.
+This should work automatically on Mac OS and Windows, but on Linux one
+extra step is needed to make sure the C libraries (terminfo)
+required by //haskeline// are installed.  Here is one way to do this:
 
-- **On Mac OS and Windows**, this should work automatically.
-
-- **On Linux**, an extra step is needed to make sure the C libraries (terminfo)
-required by //haskeline// are installed:
-
-  - On Ubuntu: ``sudo apt-get install libghc-haskeline-dev``
-  - On Fedora: ``sudo dnf install ghc-haskeline-devel``
+- On Ubuntu: ``sudo apt-get install libghc-haskeline-dev``
+- On Fedora: ``sudo dnf install ghc-haskeline-devel``
 
 
-== Getting the source ==[getting-source]
+== Getting the source ==
 
-Once you have all tools in place you can get the GF source code from
-[GitHub https://github.com/GrammaticalFramework/]:
+Once you have all tools in place you can get the GF source code. If you
+just want to compile and use GF then it is enough to have read-only
+access. It is also possible to make changes in the source code but if you
+want these changes to be applied back to the main source repository you will
+have to send the changes to us.  If you plan to work continuously on
+GF then you should consider getting read-write access.
 
-- https://github.com/GrammaticalFramework/gf-core for the GF compiler
-- https://github.com/GrammaticalFramework/gf-rgl for the Resource Grammar Library
+=== Read-only access ===
 
+==== Getting a fresh copy for read-only access ====
 
-=== Read-only access: clone the main repository ===
-
-If you only want to compile and use GF, you can just clone the repositories as follows:
+Anyone can get the latest development version of GF by running:
 
 ```
-  $ git clone https://github.com/GrammaticalFramework/gf-core.git
-  $ git clone https://github.com/GrammaticalFramework/gf-rgl.git
+$ git clone https://github.com/GrammaticalFramework/gf-core.git
+$ git clone https://github.com/GrammaticalFramework/gf-rgl.git
 ```
 
-To get new updates, run the following anywhere in your local copy of the repository:
+This will create directories ``gf-core`` and ``gf-rgl`` in the current directory.
+
+
+==== Updating your copy ====
+
+To get all new patches from each repo:
+```
+$ git pull
+```
+This can be done anywhere in your local repository.
+
+
+==== Recording local changes ====[record]
+
+Since every copy is a repository, you can have local version control
+of your changes.
+
+If you have added files, you first need to tell your local repository to
+keep them under revision control:
 
 ```
-  $ git pull
+$ git add file1 file2 ...
 ```
 
-=== Contribute your changes: fork the main repository ===
-
-If you want the possibility to contribute your changes,
-you should create your own fork, do your changes there,
-and then send a pull request to the main repository.
-
-+ **Creating and cloning a fork  —**
-See GitHub documentation for instructions how to [create your own fork https://docs.github.com/en/get-started/quickstart/fork-a-repo]
-of the repository. Once you've done it, clone the fork to your local computer.
+To record changes, use:
 
 ```
-  $ git clone https://github.com/<YOUR_USERNAME>/gf-core.git
+$ git commit file1 file2 ...
 ```
 
-+ **Updating your copy —**
-Once you have cloned your fork, you need to set up the main repository as a remote:
+This creates a patch against the previous version and stores it in your
+local repository. You can record any number of changes before
+pushing them to the main repo. In fact, you don't have to push them at
+all if you want to keep the changes only in your local repo.
+
+Instead of enumerating all modified files on the command line,
+you can use the flag ``-a`` to automatically record //all// modified
+files. You still need to use ``git add`` to add new files.
+
+
+=== Read-write access ===
+
+If you are a member of the GF project on GitHub, you can push your
+changes directly to the GF git repository on GitHub.
 
 ```
-  $ git remote add upstream https://github.com/GrammaticalFramework/gf-core.git
+$ git push
 ```
 
-Then you can get the latest updates by running the following:
+It is also possible for anyone else to contribute by
 
-```
-  $ git pull upstream master
-```
-
-+ **Recording local changes —**
-See Git tutorial on how to [record and push your changes https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository] to your fork.
-
-+ **Pull request —**
-When you want to contribute your changes to the main gf-core repository,
-[create a pull request https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request]
-from your fork.
+- creating a fork of the GF repository on GitHub,
+- working with local clone of the fork (obtained with ``git clone``),
+- pushing changes to the fork,
+- and finally sending a pull request.
 
 
 
-If you want to contribute to the RGL as well, do the same process for the RGL repository.
+== Compilation from source with Cabal ==
 
-
-== Compilation from source ==
-
-By now you should have installed Stack and Haskeline, and cloned the Git repository on your own computer, in a directory called ``gf-core``.
-
-=== Primary recommendation: use Stack ===
-
-Open a terminal, go to the top directory (``gf-core``), and type the following command.
-
-```
-$ stack install
-```
-
-It will install GF and all necessary tools and libraries to do that.
-
-
-=== Alternative: use Cabal ===
-You can also install GF using Cabal, if you prefer Cabal to Stack. In that case, you may need to install some prerequisites yourself.
-
-The actual installation process is similar to Stack: open a terminal, go to the top directory (``gf-core``), and type the following command.
+The build system of GF is based on //Cabal//, which is part of the
+Haskell Platform, so no extra steps are needed to install it. In the simplest
+case, all you need to do to compile and install GF, after downloading the
+source code as described above, is
 
 ```
 $ cabal install
 ```
 
-//The old (potentially outdated) instructions for Cabal are moved to a [separate page ../doc/gf-developers-old-cabal.html]. If you run into trouble with ``cabal install``, you may want to take a look.//
+This will automatically download any additional Haskell libraries needed to
+build GF. If this is the first time you use Cabal, you might need to run
+``cabal update`` first, to update the list of available libraries.
 
-== Compiling GF with C runtime system support ==
+If you want more control, the process can also be split up into the usual
+//configure//, //build// and //install// steps.
 
-The C runtime system is a separate implementation of the PGF runtime services.
+=== Configure ===
+
+During the configuration phase Cabal will check that you have all
+necessary tools and libraries needed for GF. The configuration is
+started by the command:
+
+```
+$ cabal configure
+```
+
+If you don't see any error message from the above command then you
+have everything that is needed for GF. You can also add the option
+``-v`` to see more details about the configuration.
+
+You can use ``cabal configure --help`` to get a list of configuration options.
+
+=== Build ===
+
+The build phase does two things. First it builds the GF compiler from
+the Haskell source code and after that it builds the GF Resource Grammar
+Library using the already build compiler.  The simplest command is:
+
+```
+$ cabal build
+```
+
+Again you can add the option ``-v`` if you want to see more details.
+
+==== Parallel builds ====
+
+If you have Cabal>=1.20 you can enable parallel compilation by using
+
+```
+$ cabal build -j
+```
+
+or by putting a line
+```
+jobs: $ncpus
+```
+in your ``.cabal/config`` file. Cabal
+will pass this option to GHC when building the GF compiler, if you
+have GHC>=7.8.
+
+Cabal also passes ``-j`` to GF to enable parallel compilation of the
+Resource Grammar Library. This is done unconditionally to avoid
+causing problems for developers with Cabal<1.20. You can disable this
+by editing the last few lines in ``WebSetup.hs``.
+
+
+==== Partial builds ====
+
+**NOTE**: The following doesn't work with recent versions of ``cabal``.
+%% // TH 2015-06-22
+
+Sometimes you just want to work on the GF compiler and don't want to
+recompile the resource library after each change. In this case use
+this extended command:
+
+```
+$ cabal build rgl-none
+```
+
+The resource library could also be compiled in two modes: with present
+tense only and with all tenses. By default it is compiled with all
+tenses. If you want to use the library with only present tense you can
+compile it in this special mode with the command:
+
+```
+$ cabal build present
+```
+
+You could also control which languages you want to be recompiled by
+adding the option ``langs=list``. For example the following command
+will compile only the English and the Swedish language:
+
+```
+$ cabal build langs=Eng,Swe
+```
+
+=== Install ===
+
+After you have compiled GF you need to install the executable and libraries
+to make the system usable.
+
+```
+$ cabal copy
+$ cabal register
+```
+
+This command installs the GF compiler for a single user, in the standard
+place used by Cabal.
+On Linux and Mac this could be ``$HOME/.cabal/bin``.
+On Mac it could also be ``$HOME/Library/Haskell/bin``.
+On Windows this is ``C:\Program Files\Haskell\bin``.
+
+The compiled GF Resource Grammar Library will be installed
+under the same prefix, e.g. in
+``$HOME/.cabal/share/gf-3.3.3/lib`` on Linux and
+in ``C:\Program Files\Haskell\gf-3.3.3\lib`` on Windows.
+
+If you want to install in some other place then use the ``--prefix``
+option during the configuration phase.
+
+=== Clean ===
+
+Sometimes you want to clean up the compilation and start again from clean
+sources. Use the clean command for this purpose:
+
+```
+$ cabal clean
+```
+
+
+%=== SDist ===
+%
+%You can use the command:
+%
+%% This does *NOT* include everything that is needed // TH 2012-08-06
+%```
+%$ cabal sdist
+%```
+%
+%to prepare archive with all source codes needed to compile GF.
+
+=== Known problems with Cabal ===
+
+Some versions of Cabal (at least version 1.16) seem to have a bug that can
+cause the following error:
+
+```
+Configuring gf-3.x...
+setup: Distribution/Simple/PackageIndex.hs:124:8-13: Assertion failed
+```
+
+The exact cause of this problem is unclear, but it seems to happen
+during the configure phase if the same version of GF is already installed,
+so a workaround is to remove the existing installation with
+
+```
+ghc-pkg unregister gf
+```
+
+You can check with ``ghc-pkg list gf`` that it is gone.
+
+== Compilation with make ==
+
+If you feel more comfortable with Makefiles then there is a thin Makefile
+wrapper arround Cabal for you. If you just type:
+```
+$ make
+```
+the configuration phase will be run automatically if needed and after that
+the sources will be compiled.
+
+%% cabal build rgl-none does not work with recent versions of Cabal
+%If you don't want to compile the resource library
+%every time then you can use:
+%```
+%$ make gf
+%```
+
+For installation use:
+```
+$ make install
+```
+For cleaning:
+```
+$ make clean
+```
+%and to build source distribution archive run:
+%```
+%$ make sdist
+%```
+
+== Compiling GF with C run-time system support ==
+
+The C run-time system is a separate implementation of the PGF run-time services.
 It makes it possible to work with very large, ambiguous grammars, using
-probabilistic models to obtain probable parses. The C runtime system might
-also be easier to use than the Haskell runtime system on certain platforms,
+probabilistic models to obtain probable parses. The C run-time system might
+also be easier to use than the Haskell run-time system on certain platforms,
 e.g. Android and iOS.
 
-To install the C runtime system, go to the ``src/runtime/c`` directory.
+To install the C run-time system, go to the ``src/runtime/c`` directory
+%and follow the instructions in the ``INSTALL`` file.
+and use the ``install.sh`` script:
+```
+bash setup.sh configure
+bash setup.sh build
+bash setup.sh install
+```
+This will install
+the C header files and libraries need to write C programs that use PGF grammars.
+Some example C programs are included in the ``utils`` subdirectory, e.g.
+``pgf-translate.c``.
 
-- **On Linux and Mac OS —**
-  You should have autoconf, automake, libtool and make.
-  If you are missing some of them, follow the
-  instructions in the [INSTALL https://github.com/GrammaticalFramework/gf-core/blob/master/src/runtime/c/INSTALL] file.
-
-  Once you have the required libraries, the easiest way to install the C runtime is to use the ``install.sh`` script. Just type
-
-  ``$ bash install.sh``
-
-  This will install the C header files and libraries need to write C programs
-  that use PGF grammars.
-
-%  If this doesn't work for you, follow the manual instructions in the [INSTALL https://github.com/GrammaticalFramework/gf-core/blob/master/src/runtime/c/INSTALL] file under your operating system.
-
-- **On other operating systems —** Follow the instructions in the
-[INSTALL https://github.com/GrammaticalFramework/gf-core/blob/master/src/runtime/c/INSTALL] file under your operating system.
-
-
-
-Depending on what you want to do with the C runtime, you can follow one or more of the following steps.
-
-=== Use the C runtime from another programming language ===[bindings]
-
-% **If you just want to use the C runtime from Python, Java, or Haskell, you don't need to change your GF installation.**
-
-- **What —**
-This is the most common use case for the C runtime: compile
-your GF grammars into PGF with the standard GF executable,
-and manipulate the PGFs from another programming language,
-using the bindings to the C runtime.
-
-
-- **How —**
-The Python, Java and Haskell bindings are found in the
-``src/runtime/{python,java,haskell-bind}`` directories,
-respecively. Compile them by following the instructions
-in the ``INSTALL`` or ``README`` files in those directories.
-
-The Python library can also be installed from PyPI using ``pip install pgf``.
-
-
-//If you are on Mac and get an error about ``clang`` version, you can try some of [these solutions https://stackoverflow.com/questions/63972113/big-sur-clang-invalid-version-error-due-to-macosx-deployment-target]—but be careful before removing any existing installations.//
-
-
-=== Use GF shell with C runtime support ===
-
-- **What —**
-If you want to use the GF shell with C runtime functionalities, then you need to (re)compile GF with special flags.
-
-The GF shell can be started with ``gf -cshell`` or ``gf -crun`` to use
-the C run-time system instead of the Haskell run-time system.
-Only limited functionality is available when running the shell in these
-modes (use the ``help`` command in the shell for details).
-
-(Re)compiling your GF with these flags will also give you
-Haskell bindings to the C runtime, as a library called ``PGF2``,
-but if you want Python or Java bindings, you need to do [the previous step #bindings].
-
-% ``PGF2``: a module to import in Haskell programs, providing a binding to the C run-time system.
-
-- **How —**
-If you use cabal, run the following command:
+When the C run-time system is installed, you can install GF with C run-time
+support by doing
 
 ```
-cabal install -fc-runtime
+cabal install -fserver -fc-runtime
 ```
+from the top directory. This give you three new things:
 
-from the top directory (``gf-core``).
+- ``PGF2``: a module to import in Haskell programs, providing a binding to
+   the C run-time system.
 
-If you use stack, uncomment the following lines in the ``stack.yaml`` file:
+- The GF shell can be started with ``gf -cshell`` or ``gf -crun`` to use
+  the C run-time system instead of the Haskell run-time system.
+  Only limited functionality is available when running the shell in these
+  modes (use the ``help`` command in the shell for details).
 
-```
-flags:
-   gf:
-     c-runtime: true
-extra-lib-dirs:
-   - /usr/local/lib
-```
-and then run ``stack install`` from the top directory (``gf-core``).
+- ``gf -server`` mode is extended with new requests to call the C run-time
+   system, e.g. ``c-parse``, ``c-linearize`` and ``c-translate``.
 
 
-//If you get an "``error while loading shared libraries``" when trying to run GF with C runtime, remember to declare your ``LD_LIBRARY_PATH``.//
-//Add ``export LD_LIBRARY_PATH="/usr/local/lib"`` to either your ``.bashrc`` or ``.profile``. You should now be able to start GF with C runtime.//
-
-
-=== Use GF server mode with C runtime ===
-
-- **What —**
-With this feature, ``gf -server`` mode is extended with new requests to call the C run-time
-system, e.g. ``c-parse``, ``c-linearize`` and ``c-translate``.
-
-- **How —**
-If you use cabal, run the following command:
-
-```
-cabal install -fc-runtime -fserver
-```
-from the top directory.
-
-If you use stack, add the following lines in the ``stack.yaml`` file:
-
-```
-flags:
-   gf:
-     c-runtime: true
-     server: true
-extra-lib-dirs:
-   - /usr/local/lib
-```
-
-and then run ``stack install``, also from the top directory.
-
+=== Python and Java bindings ===
 
+The C run-time system can also be used from Python and Java. Python and Java
+bindings are found in the ``src/runtime/python`` and ``src/runtime/java``
+directories, respecively. Compile them by following the instructions in
+the ``INSTALL`` files in those directories.
 
 == Compilation of RGL ==
 
 As of 2018-07-26, the RGL is distributed separately from the GF compiler and runtimes.
 
-To get the source, follow the previous instructions on [how to clone a repository with Git #getting-source].
-
-After cloning the RGL, you should have a directory named ``gf-rgl`` on your computer.
-
 === Simple ===
 To install the RGL, you can use the following commands from within the ``gf-rgl`` repository:
 ```
@@ -317,68 +416,103 @@ If you do not have Haskell installed, you can use the simple build script ``Setu
 
 == Creating binary distribution packages ==
 
-The binaries are generated with Github Actions. More details can be viewed here:
+=== Creating .deb packages for Ubuntu ===
 
-https://github.com/GrammaticalFramework/gf-core/actions/workflows/build-binary-packages.yml
+This was tested on Ubuntu 14.04 for the release of GF 3.6, and the
+resulting ``.deb`` packages appears to work on Ubuntu 12.04, 13.10 and 14.04.
+For the release of GF 3.7, we generated ``.deb`` packages on Ubuntu 15.04 and
+tested them on Ubuntu 12.04 and 14.04.
 
+Under Ubuntu, Haskell executables are statically linked against other Haskell
+libraries, so the .deb packages are fairly self-contained.
 
-== Running the test suite ==
-
-The GF test suite is run with one of the following commands from the top directory:
+==== Preparations ====
 
 ```
-  $ cabal test
+sudo apt-get install dpkg-dev debhelper
 ```
 
-or
+==== Creating the package ====
+
+Make sure the ``debian/changelog`` starts with an entry that describes the
+version you are building. Then run
 
 ```
-  $ stack test
+make deb
 ```
 
+If get error messages about missing dependencies
+(e.g. ``autoconf``, ``automake``, ``libtool-bin``, ``python-dev``,
+``java-sdk``, ``txt2tags``)
+use ``apt-get intall`` to install them, then try again.
+
+
+=== Creating OS X Installer packages ===
+
+Run
+
+```
+make pkg
+```
+
+=== Creating binary tar distributions ===
+
+Run
+
+```
+make bintar
+```
+
+=== Creating .rpm packages for Fedora ===
+
+This is possible, but the procedure has not been automated.
+It involves using the cabal-rpm tool,
+
+```
+sudo dnf install cabal-rpm
+```
+
+and following the Fedora guide
+[How to create an RPM package http://fedoraproject.org/wiki/How_to_create_an_RPM_package].
+
+Under Fedora, Haskell executables are dynamically linked against other Haskell
+libraries, so ``.rpm`` packages for all Haskell libraries that GF depends on
+are required. Most of them are already available in the Fedora distribution,
+but a few of them might have to be built and distributed along with
+the GF ``.rpm`` package.
+When building ``.rpm`` packages for GF 3.4, we also had to build ``.rpm``s for
+``fst`` and ``httpd-shed``.
+
+== Running the testsuite ==
+
+**NOTE:** The test suite has not been maintained recently, so expect many
+tests to fail.
+%% // TH 2012-08-06
+
+GF has testsuite. It is run with the following command:
+```
+$ cabal test
+```
 The testsuite architecture for GF is very simple but still very flexible.
 GF by itself is an interpreter and could execute commands in batch mode.
 This is everything that we need to organize a testsuite. The root of the
-testsuite is the ``testsuite/`` directory. It contains subdirectories
-which themselves contain GF batch files (with extension ``.gfs``).
-The above command searches the subdirectories of the ``testsuite/`` directory
-for files with extension ``.gfs`` and when it finds one, it is executed with
-the GF interpreter. The output of the script is stored in file with extension ``.out``
-and is compared with the content of the corresponding file with extension ``.gold``, if there is one.
+testsuite is the testsuite/ directory. It contains subdirectories which
+themself contain GF batch files (with extension .gfs). The above command
+searches the subdirectories of the testsuite/ directory for files with extension
+.gfs and when it finds one it is executed with the GF interpreter.
+The output of the script is stored in file with extension .out and is compared
+with the content of the corresponding file with extension .gold, if there is one.
+If the contents are identical the command reports that the test was passed successfully.
+Otherwise the test had failed.
 
-Every time when you make some changes to GF that have to be tested,
-instead of writing the commands by hand in the GF shell, add them to one ``.gfs``
-file in the testsuite subdirectory where its ``.gf`` file resides and run the test.
-In this way you can use the same test later and we will be sure that we will not
-accidentally break your code later.
-
-**Test Outcome - Passed:** If the contents of the files with the ``.out`` extension
-are identical to their correspondingly-named files with the extension ``.gold``,
-the command will report that the tests passed successfully, e.g.
+Every time when you make some changes to GF that have to be tested, instead of
+writing the commands by hand in the GF shell, add them to one .gfs file in the testsuite
+and run the test. In this way you can use the same test later and we will be sure
+that we will not incidentaly break your code later.
 
+If you don't want to run the whole testsuite you can write the path to the subdirectory
+in which you are interested. For example:
 ```
- Running 1 test suites...
- Test suite gf-tests: RUNNING...
- Test suite gf-tests: PASS
- 1 of 1 test suites (1 of 1 test cases) passed.
+$ cabal test testsuite/compiler
 ```
-
-**Test Outcome - Failed:**  If there is a contents mismatch between the files
-with the ``.out`` extension and their corresponding files with the extension ``.gold``,
-the test diagnostics will show a fail and the areas that failed. e.g.
-
-```
-  testsuite/compiler/compute/Records.gfs: OK
-  testsuite/compiler/compute/Variants.gfs: FAIL
-  testsuite/compiler/params/params.gfs: OK
-  Test suite gf-tests: FAIL
-  0 of 1 test suites (0 of 1 test cases) passed.
-```
-
-The fail results overview is available in gf-tests.html which shows 4 columns:
-
-+ __Results__ - only areas that fail will appear. (Note: There are 3 failures in the gf-tests.html which are labelled as (expected). These failures should be ignored.)
-+ __Input__ - which is the test written in the .gfs file
-+ __Gold__ - the expected output from running the test set out in the .gfs file. This column refers to the contents from the .gold extension files.
-+ __Output__ - This column refers to the contents from the .out extension files which are generated as test output.
-After fixing the areas which fail, rerun the test command. Repeat the entire process of fix-and-test until the test suite passes before  submitting a pull request to include your changes.
+will run only the testsuite for the compiler.

doc/gf-editor-modes.t2t

@@ -15,13 +15,6 @@ instructions inside.
 ==Atom==
 [language-gf https://atom.io/packages/language-gf], by John J. Camilleri
 
-==Visual Studio Code==
-
-- [Grammatical Framework Language Server https://marketplace.visualstudio.com/items?itemName=anka-213.gf-vscode] by Andreas Källberg.
-  This provides syntax highlighting and a client for the Grammatical Framework language server. Follow the installation instructions in the link.
-- [Grammatical Framework https://marketplace.visualstudio.com/items?itemName=GrammaticalFramework.gf-vscode] is a simpler extension
-  without any external dependencies which provides only syntax highlighting.
-
 ==Eclipse==
 
 [GF Eclipse Plugin https://github.com/GrammaticalFramework/gf-eclipse-plugin/], by John J. Camilleri

doc/gf-people.md

@@ -7,6 +7,7 @@ title: "Grammatical Framework: Authors and Acknowledgements"
 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/).
@@ -21,7 +22,6 @@ and
 
 The following people have contributed code to some of the versions:
 
-- [Thomas Hallgren](http://www.cse.chalmers.se/~hallgren/) (University of Gothenburg)
 - 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)
@@ -32,7 +32,6 @@ The following people have contributed code to some of the versions:
 - [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)
-- Lauri Alanko (University of Helsinki)
 
 At least the following colleagues are thanked for suggestions, bug
 reports, and other indirect contributions to the code.

doc/gf-refman.md

@@ -1224,15 +1224,14 @@ modules.
 
 Here are some flags commonly included in grammars.
 
-  flag             value                description                        module
-  ------------     -------------------- ---------------------------------- ----------
-  `coding`         character encoding   encoding used in string literals   concrete
-  `startcat`       category             default target of parsing          abstract
-  `case_sensitive` on/off               controlls the case sensitiveness   concrete
+  flag         value                description                        module
+  ------------ -------------------- ---------------------------------- ----------
+  `coding`     character encoding   encoding used in string literals   concrete
+  `startcat`   category             default target of parsing          abstract
 
 The possible values of these flags are specified [here](#flagvalues).
 Note that the `lexer` and `unlexer` flags are deprecated. If you need
-their functionality, you should supply them to GF shell commands
+their functionality, you should use supply them to GF shell commands
 like so:
 
     put_string -lextext "страви, напої" | parse
@@ -1810,23 +1809,6 @@ As the last rule, subtyping is transitive:
 -   if *A* is a subtype of *B* and *B* is a subtype of *C*, then *A* is
     a subtype of *C*.
 
-### List categories
-
-[]{#lists}
-
-Since categories of lists of elements of another category are a common idiom, the following syntactic sugar is available:
-
-    cat [C] {n}
-
-abbreviates a set of three judgements:
-
-   cat ListC ;
-   fun BaseC : C -> ... -> C -> ListC ; --n C’s
-   fun ConsC : C -> ListC -> ListC
-
-The functions `BaseC` and `ConsC` are automatically generated in the abstract syntax, but their linearizations, as well as the linearization type of `ListC`, must be defined manually. The type expression `[C]` is in all contexts interchangeable with `ListC`.
-
-More information on lists in GF can be found [here](https://inariksit.github.io/gf/2021/02/22/lists.html).
 
 ### Tables and table types
 
@@ -2131,7 +2113,7 @@ of *x*, and the application thereby disappears.
 
 []{#reuse}
 
-*This section is valid for GF 3.0, which abandons the \"[lock field](https://inariksit.github.io/gf/2018/05/25/subtyping-gf.html#lock-fields)\"*
+*This section is valid for GF 3.0, which abandons the \"lock field\"*
 *discipline of GF 2.8.*
 
 As explained [here](#openabstract), abstract syntax modules can be
@@ -2295,12 +2277,6 @@ for parsing, random generation, and any other grammar operation that
 depends on category. Its legal values are the categories defined or
 inherited in the abstract syntax.
 
-The flag `case_sensitive` has value `on` by default which means that
-the parser will always match the input with the grammar predictions
-in a case sensitive manner. This can be overriden by setting the flag
-to `off`. The flag also controlls how the linearizer matches the
-prefixes in the `pre` construction.
-
 
 ### Compiler pragmas
 

doc/gf-video-tutorials.md

@@ -1,35 +0,0 @@
----
-title: "Video tutorials"
----
-
-The GF [YouTube channel](https://www.youtube.com/channel/UCZ96DechSUVcXAhtOId9VVA) keeps a playlist of [all GF videos](https://www.youtube.com/playlist?list=PLrgqBB5thLeT15fUtJ8_Dtk8ppdtH90MK), and more specific playlists for narrower topics.
-If you make a video about GF, let us know and we'll add it to the suitable playlist(s)!
-
-- [General introduction to GF](#general-introduction-to-gf)
-- [Beginner resources](#beginner-resources)
-- [Resource grammar tutorials](#resource-grammar-tutorials)
-
-## General introduction to GF
-
-These videos introduce GF at a high level, and present some use cases.
-
-__Grammatical Framework: Formalizing the Grammars of the World__
-
-<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/x1LFbDQhbso" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-
-__Aarne Ranta: Automatic Translation for Consumers and Producers__
-
-<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/An-AmFScw1o" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-
-## Beginner resources
-
-These videos show how to install GF on your computer (Mac or Windows), and how to play with simple grammars in a [Jupyter notebook](https://github.com/GrammaticalFramework/gf-binder) (any platform, hosted at [mybinder.org](https://mybinder.org)).
-
-<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/videoseries?list=PLrgqBB5thLeRa8eViJJnjT8jBhxqCPMF2" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-
-## Resource grammar tutorials
-
-These videos show incremental improvements to a [miniature version of the resource grammar](https://github.com/inariksit/comp-syntax-2020/tree/master/lab2/grammar/dummy#readme).
-They assume some prior knowledge of GF, roughly lessons 1-3 from the [GF tutorial](http://www.grammaticalframework.org/doc/tutorial/gf-tutorial.html).
-
-<iframe width="560" height="315" src="https://www.youtube-nocookie.com/embed/videoseries?list=PLrgqBB5thLeTPkp88lnOmRtprCa8g0wX2" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>

doc/hackers-guide/CompilationOverview.md

@@ -1,11 +0,0 @@
-# Compilation
-
-The GF language is designed to be easy for the programmers to use but be able to run it efficiently we need to reduce it to a more low-level language. The goal of this chapter is to give an overview of the different steps in the compilation. The program transformation goes throught the following phases:
-
-- renaming - here all identifiers in the grammar are made explicitly qualified. For example, if you had used the identifier PredVP somewhere, the compiler will search for a definition of that identifier in either the current module or in any of the modules imported from the current one. If a definition is found in, say in a module called Sentence, then the unqualified name PredVP will be replaced with the explicit qualification Sentence.PredVP. On the other hand, if the source program is already using an explicit qualification like Sentence.PredVP, then the compiler will check whether PredVP is indeed defined in the module Sentence. 
-
-- type checking - here the compiler will check whether all functions and variables are used correctly with respect to their types. For each term that the compiler checks it will also generate a new version of the term after the type checking. The input and output terms may not need to be the same. For example, the compiler may insert explicit type information. It might fill-in implicit arguments, or it may instantiate meta variables.
-
-- partial evaluation - here is where the real compilation starts. The compiler will fully evaluate the term for each linearization to a normal. In the process, all uses of operations will be inlined. This is part of reducing the GF language to a simpler language which does not support operations.
-
-- PMCFG generation - the language that the GF runtime understands is an extension of the PMCFG formalism. Not all features permitted in the GF language are allowed on that level. Most of the uses for that extra features have been eliminated via partial evaluation. If there are any left, then the compilation will abort. The main purpose of the PMCFG generation is to get rid of most of the parameter types in the source grammar. That is possible by generating several specialized linearization rules from a single linearization rule in the source.

doc/hackers-guide/DESIDERATA.md

@@ -1,51 +0,0 @@
-This is an experiment to develop **a majestic new GF runtime**.
-
-The reason is that there are several features that we want to have and they all require a major rewrite of the existing C runtime.
-Instead of beating the old code until it starts doing what we want, it is time to start from scratch.
-
-# New Features
-
-The features that we want are:
-
-- We want to support **even bigger grammars that don't fit in the main memory** anymore. Instead, they should reside on the disc and parts will be loaded on demand.
-The current design is that all memory allocated for the grammars should be from memory-mapped files. In this way the only limit for the grammar size will
-be the size of the virtual memory, i.e. 2^64 bytes. The swap file is completely circumvented, while all of the available RAM can be used as a cache for loading parts
-of the grammar.
-
-- We want to be able to **update grammars dynamically**. This is a highly desired feature since recompiling large grammars takes hours.
-Instead, dynamic updates should happen instantly.
-
-- We want to be able to **store additional information in the PGF**. For example that could be application specific semantic data.
-Another example is to store the source code of the different grammar rules, to allow the compiler to recompile individual rules.
-
-- We want to **allow a single file to contain slightly different versions of the grammar**. This will be a kind of a version control system,
-which will allow different users to store their own grammar extensions while still using the same core content.
-
-- We want to **avoid the exponential explosion in the size of PMCFG** for some grammars. This happens because PMCFG as a formalism is too low-level.
-By enriching it with light-weight variables, we can make it more powerful and hopefully avoid the exponential explosion.
-
-- We want to finally **ditch the old Haskell runtime** which has long outlived its time.
-
-There are also two bugs in the old C runtime whose fixes will require a lot of changes, so instead of fixing the old runtime we do it here:
-
-- **Integer literals in the C runtime** are implemented as 32-bit integers, while the Haskell runtime used unlimited integers.
-Python supports unlimited integers too, so it would be nice to support them in the new runtime as well.
-
-- The old C runtime assumed that **String literals are terminated with the NULL character**. None of the modern languages (Haskell, Python, Java, etc) make
-that assumption, so we should drop it too.
-
-# Consequences
-
-The desired features will have the following implementation cosequences.
-
-- The switch from memory-based to disc-based runtime requires one big change. Before it was easy to just keep a pointer from one object to another.
-Unfortunately this doesn't work with memory-mapped files, since every time when you map a file into memory it may end up at a different virtual address.
-Instead we must use file offsets. In order to make programming simpler, the new runtime will be **implemented in C++ instead of C**. This allows us to overload
-the arrow operator (`->`) which will dynamically convert file offsets to in-memory pointers.
-
-- The choice of C++ also allows us to ditch the old `libgu` library and **use STL** instead.
-
-- The content of the memory mapped files is platform-specific. For that reason there will be two grammar representations:
-     - **Native Grammar Format** (`.ngf`) - which will be instantly loadable by just mapping it to memory, but will be platform-dependent.
-     - **Portable Grammar Format** (`.pgf`) - which will take longer to load but will be more compact and platform independent.
-  The runtime will be able to load `.pgf` files and convert them to `.ngf`. Conversely `.pgf` can be exported from the current `.ngf`.

doc/hackers-guide/LambdaCalculus.md

@@ -1,217 +0,0 @@
-The concrete syntax in GF is expressed in a special kind of functional language. Unlike in other functional languages, all GF programs are computed at compile time. The result of the computation is another program in a simplified formalized called Parallel Multiple Context-Free Grammar (PMCFG). More on that later. For now we will only discuss how the computations in a GF program work.
-
-At the heart of the GF compiler is the so called partial evaluator. It computes GF terms but it also have the added super power to be able to work with unknown variables. Consider for instance the term ``\s -> s ++ ""``. A normal evaluator cannot do anything with it, since in order to compute the value of the lambda function, you need to know the value of ``s``. In the computer science terminology the term is already in its normal form. A partial evaluator on the other hand, will just remember that ``s`` is a variable with an unknown value and it will try to compute the expression in the body of the function. After that it will construct a new function where the body is precomputed as much as it goes. In the concrete case the result will be ``\s -> s``, since adding an empty string to any other string produces the same string.
-
-Another super power of the partial evaluator is that it can work with meta variables. The syntax for meta variables in GF is ``?0, ?1, ?2, ...``, and they are used as placeholders which mark parts of the program that are not finished yet. The partial evaluator has no problem to work with such incomplete programs. Sometimes the result of the computation depends on a yet unfinished part of the program, then the evaluator just suspends the computation. In other cases, the result is completely independent of the existance of metavariables. In the later, the evaluator will just return the result.
-
-One of the uses of the evaluator is during type checking where we must enforce certain constraints. The constraints may for instance indicate that the only way for them to be satisfied is to assign a fixed value to one or more of the meta variables. The partial evaluator does that as well. Another use case is during compilation to PMCFG. The compiler to PMCFG, in certain cases assigns to a metavariable all possible values that the variable may have and it then produces different results.
-
-In the rest of we will discuss the implementation of the partial evaluator.
-
-# Simple Lambda Terms
-
-We will start with the simplest possible subset of the GF language, also known as simple lambda calculus. It is defined as an algebraic data type in Haskell, as follows:
-```Haskell
-data Term
-  = Vr Ident           -- i.e. variables: x,y,z ...
-  | Cn Ident           -- i.e. constructors: cons, nil, etc.
-  | App Term Term      -- i.e. function application: @f x@
-  | Abs Ident Term     -- i.e. \x -> t
-```
-The result from the evaluation of a GF term is either a constructor applied to a list of other values, or an unapplied lambda abstraction:
-```Haskell
-type Env = [(Ident,Value)]
-data Value
-  = VApp Ident [Value]   -- i.e. constructor application
-  | VClosure Env Term    -- i.e. a closure contains an environment and the term for a lambda abstraction
-  | VGen Int [Value]     -- we will also need that special kind of value for the partial evaluator
-```
-For the lambda abstractions we build a closure which preserves the environment as it was when we encountered the abstraction. That is necessary since its body may contain free variables whose values are defined in the environment.
-
-The evaluation itself is simple:
-```Haskell
-eval env (Vr x)          args = apply (lookup x env) args
-eval env (Cn c)          args = VApp c args
-eval env (App t1 t2)     args = eval env t1 (eval env t2 : args)
-eval env (Abs x t)         [] = VClosure env (Abs x t)
-eval env (Abs x t) (arg:args) = eval ((x,v):env) t args
-
-apply (VApp c vs)                    args = VApp c (vs++args)
-apply (VClosure env (Abs x t)) (arg:args) = eval ((x,arg):env) t args
-apply (VGen i vs)                    args = VGen i (vs++args)
-```
-Here the we use the `apply` function to apply an already evaluated term to a list of arguments.
-
-When we talk about functional languages, we usually discuss the evaluation order and we differentiate between about lazy and strict languages. Simply speaking, a strict language evaluates the arguments of a function before the function is called. In a lazy language, on the other hand, the arguments are passed unevaluated and are computed only if the value is really needed for the execution of the function. The main advantage of lazy languages is that they guarantee the termination of the computation in some cases where strict languages don't. The GF language does not allow recursion and therefore all programs terminate. Looking from only that angle it looks like the evaluation order is irrelevant in GF. Perhaps that is also the reason why this has never been discussed before. The question, however, becomes relevant again if we want to have an optimal semantics for variants. As we will see in the next section, the only way to get that is if we define GF as a lazy language.
-
-After that discussion, there is an interesting question. Does the eval/apply implementation above define a strict or a lazy language? We have the rule:
-```Haskell
-eval env (App t1 t2)  vs  = eval env t1 (eval env t2 : vs)
-```
-where we see that when a term `t1` is applied to a term `t2` then both get evaluated. The answer to the question then depends on the semantics of the implementation language. Since the evaluation is implemented in Haskell, `eval env t2` would not be computed unless if its value is really neeeded. Therefore, our implementation defines a new lazy language. On the other hand, if the same algorithm is directly transcribed in ML then it will define a strict one instead of a lazy one.
-
-So far we only defined the evaluator which does the usual computations, but it still can't simplify terms like ``\s -> s ++ ""`` where the simplification happens under the lambda abstraction. The normal evaluator would simply return the abstraction unchanged. To take the next step, we also need a function which takes a value and produces a new term which is precomputed as much as possible:
-```Haskell
-value2term i (VApp c vs) =
-  foldl (\t v -> App t (value2term i v)) (Cn c) vs
-value2term i (VGen j vs) =
-  foldl (\t v -> App t (value2term i v)) (Vr ('v':show j)) vs
-value2term i (VClosure env (Abs x t)) =
-  let v = eval ((x,VGen i []):env) t []
-  in Abs ('v':show i) (value2term (i+1) v)
-```
-The interesting rule here is how closures are turned back to terms. We simply evaluate the body of the lambda abstraction with an environment which binds the variable with the special value `VGen i []`. That value stands for the free variable bound by the `i`-th lambda abstraction counted from the outset of the final term inwards. The only thing that we can do with a free variable is to apply it to other values and this is exactly what `apply` does above. After we evaluate the body of the lambda abstraction, the final value is turned back to a term and we reapply a lambda abstraction on top of it. Note that here we also use `i` as a way to generate fresh variables. Whenever, `value2term` encounters a `VGen` it concerts it back to a variable, i.e. `Vr ('v':show j)`.
-
-Given the two functions `eval` and `value2term`, a partial evaluator is defined as:
-```Haskell
-normalForm t = value2term 0 (eval [] t [])
-```
-
-Of course the rules above describe only the core of a functional language. If we really want to be able to simplify terms like ``\s -> s ++ ""``, then we must
-add string operations as well. The full implementation of GF for instance knows that an empty string concatenated with any other value results in the same value. This is true even if the other value is actually a variable, i.e. a `VGen` in the internal representation. On the other hand, it knows that pattern matching on a variable is impossible to precompute. In other words, the partial evaluator would leave the term:
-```GF
-\x -> case x of {
-        _+"s" -> x+"'"
-        _     -> x+"'s"
-      }
-```
-unchanged since it can't know whether the value of `x` ends with `"s"`.
-
-# Variants
-
-GF supports variants which makes its semantics closer to the language [Curry](https://en.wikipedia.org/wiki/Curry_(programming_language)) than to Haskell. We support terms like `("a"|"b")` which are used to define equivalent linearizations for one and the same semantic term. Perhaps the most prototypical example is for spelling variantions. For instance, if we want to blend British and American English into the same language then we can use `("color"|"colour")` whenever either of the forms is accepted.
-
-The proper implementation for variants complicates the semantics of the language a lot. Consider the term `(\x -> x + x) ("a"|"b")`! Its value depends on whether our language is defined as lazy or strict. In a strict language, we will first evaluate the argument:
-```GF
-   (\x -> x + x) ("a"|"b")
-=> ((\x -> x + x) "a") | ((\x -> x + x) "b")
-=> ("a"+"a") | ("b"+"b")
-=> ("aa"|"bb")
-```
-and therefore there are only two values `"aa"´ and `"bb"´. On the other hand in a lazy language, we will do the function application first:
-```GF
-   (\x -> x + x) ("a"|"b")
-=> ("a"|"b") + ("a"|"b")
-=> ("aa"|"ab"|"ba"|"bb")
-```
-and get four different values. The experience shows that a semantics producing only two values is more useful since it gives us a way to control how variants are expanded. If you want the same variant to appear in two different places, just bind the variant to a variable first! It looks like a strict evaluation order has an advantage here. Unfortunately that is not always the case. Consider another example, in a strict order:
-```GF
-   (\x -> "c") ("a"|"b")
-=> ((\x -> "c") "a") | ((\x -> "c") "b")
-=> ("c" | "c")
-```
-Here we get two variants with one and the same value "c". A lazy evaluation order would have avoided the redundancy since `("a"|"b")` would never have been computed.
-
-The best strategy is to actually use lazy evaluation but not to treat the variants as values. Whenever we encounter a variant term, we just split the evaluation in two different branches, one for each variant. At the end of the computation, we get a set of values which does not contain variants. The partial evaluator converts each value back to a term and combines all terms back to a single one by using a top-level variant. The first example would then compute as:
-```GF
-   (\x -> x + x) ("a"|"b")
-=> x + x where x = ("a"|"b")
-
--- Branch 1:
-=> x + x where x = "a"
-=> "a" + "a" where x = "a"
-=> "aa"
-
--- Branch 2:
-=> x + x where x = "b"
-=> "b" + "b" where x = "b"
-=> "bb"
-```
-Here the first step proceeds without branching. We just compute the body of the lambda function while remembering that `x` is bound to the unevaluated term `("a"|"b")`. When we encounter the concatenation `x + x`, then we actually need the value of `x`. Since it is bound to a variant, we must split the evaluation into two branches. In each branch `x` is rebound to either of the two variants `"a"` or `"b"`. The partial evaluator would then recombine the results into `"aa"|"bb"`.
-
-If we consider the second example, it will proceed as:
-```GF
-   (\x -> "c") ("a"|"b")
-=> "c" where x = ("a"|"b")
-=> "c"
-```
-since we never ever needed the value of `x`.
-
-There are a lot of other even more interesting examples when we take into account that GF also supports record types and parameter types. Consider this:
-```GF
-   (\x -> x.s1+x.s1) {s1="s"; s2="a"|"b"}
-=> x.s1+x.s1 where x = {s1="s"; s2="a"|"b"}
-=> "s"+"s"
-=> "ss"
-```
-Here when we encounter `x.s1`, we must evaluate `x` and then its field `s1` but not `s2`. Therefore, there is only one variant. On the other hand, here:
-```GF
-   (\x -> x.s2+x.s2) {s1="s"; s2="a"|"b"}
-=> x.s2+x.s2 where x = {s1="s"; s2="a"|"b"}
-
--- Branch 1
-x.s2+x.s2 where x = {s1="s"; s2="a"}
-"a"+"a"
-"aa"
-
--- Branch 2
-x.s2+x.s2 where x = {s1="s"; s2="b"}
-"b"+"b"
-"bb"
-```
-we branch only after encountering the variant in the `s2` field.
-
-The implementation for variants requires the introduction of a nondeterministic monad with a support for mutable variables. See this [paper](https://gup.ub.gu.se/file/207634):
-
-Claessen, Koen & Ljunglöf, Peter. (2000). Typed Logical Variables in Haskell. Electronic Notes Theoretical Computer Science. 41. 37. 10.1016/S1571-0661(05)80544-4.
-
-for possible implementations. Our concrete implemention is built on top of the `ST` monad in Haskell and provides the primitives:
-```Haskell
-newThunk :: Env s -> Term -> EvalM s (Thunk s)
-newEvaluatedThunk :: Value s -> EvalM s (Thunk s)
-force :: Thunk s -> EvalM s (Value s)
-msum :: [EvalM s a] -> EvalM s a
-runEvalM :: (forall s . EvalM s a) -> [a]
-```
-Here, a `Thunk` is either an unevaluated term or an already computed value. Internally, it is implement as an `STRef`. If the thunk is unevaluated, it can be forced to an evaluated state by calling `force`. Once a thunk is evaluated, it remains evaluated forever. `msum`, on the other hand, makes it possible to nondeterministically branch into a list of possible actions. Finally, `runEvalM` takes a monadic action and returns the list of all possible results.
-
-The terms and the values in the extended language are similar with two exceptions. We add the constructor `FV` for encoding variants in the terms, and the constructors for values now take lists of thunks instead of values:
-```Haskell
-data Term
-  = Vr Ident           -- i.e. variables: x,y,z ...
-  | Cn Ident           -- i.e. constructors: cons, nil, etc.
-  | App Term Term      -- i.e. function application: @f x@
-  | Abs Ident Term     -- i.e. \x -> t
-  | FV [Term]          -- i.e. a list of variants: t1|t2|t3|...
-
-type Env s = [(Ident,Thunk s)]
-data Value s
-  = VApp Ident [Thunk s]   -- i.e. constructor application
-  | VClosure (Env s) Term  -- i.e. a closure contains an environment and the term for a lambda abstraction
-  | VGen Int [Thunk s]     -- i.e. an internal representation for free variables
-```
-The eval/apply rules are similar 
-```Haskell
-eval env (Vr x)          args = do tnk <- lookup x env
-                                   v   <- force tnk
-                                   apply v args
-eval env (Cn c)          args = return (VApp c args)
-eval env (App t1 t2)     args = do tnk <- newThunk env t2
-                                   eval env t1 (tnk : args)
-eval env (Abs x t)         [] = return (VClosure env (Abs x t))
-eval env (Abs x t) (arg:args) = eval ((x,arg):env) t args
-eval env (FV ts)         args = msum [eval env t args | t <- ts]
-
-apply (VApp f  vs)                   args = return (VApp f (vs++args))
-apply (VClosure env (Abs x t)) (arg:args) = eval ((x,arg):env) t args
-apply (VGen i  vs)                   args = return (VGen i (vs++args))
-```
-
-```Haskell
-value2term i (VApp c tnks) =
-  foldM (\t tnk -> fmap (App t) (force tnk >>= value2term i)) (Cn c) tnks
-value2term i (VGen j tnks) =
-  foldM (\t tnk -> fmap (App t) (force tnk >>= value2term i)) (Vr ('v':show j)) tnks
-value2term i (VClosure env (Abs x t)) = do
-  tnk <- newEvaluatedThunk (VGen i [])
-  v <- eval ((x,tnk):env) t []
-  t <- value2term (i+1) v
-  return (Abs ('v':show i) t)
-
-normalForm gr t =
-  case runEvalM gr (eval [] t [] >>= value2term 0) of
-    [t] -> t
-    ts  -> FV ts
-```
-
-# Meta Variables

doc/hackers-guide/README.md

@@ -1,20 +0,0 @@
-# The Hacker's Guide to GF
-
-This is the hacker's guide to GF, for the guide to the galaxy, see the full edition [here](https://en.wikipedia.org/wiki/The_Hitchhiker%27s_Guide_to_the_Galaxy).
-Here we will limit outselves to the vastly narrower domain of the [GF](https://www.grammaticalframework.org) runtime. This means that we will not meet
-any [Vogons](https://en.wikipedia.org/wiki/Vogon), but we will touch upon topics like memory management, databases, transactions, compilers,
-functional programming, theorem proving and sometimes even languages. Subjects that no doubt would interest any curious hacker.
-
-So, **Don't Panic!** and keep reading. This is a live document and will develop together with the runtime itself.
-
-**TABLE OF CONTENTS**
-
-1. Compilation
-   1. [Overview](CompilationOverview.md)
-   1. [Lambda Calculus](LambdaCalculus.md)
-   2. [Parallel Multiple Context-Free Grammars](PMCFG.md)
-2. Runtime
-   1. [Desiderata](DESIDERATA.md)
-   2. [Memory Model](memory_model.md)
-   3. [Abstract Expressions](abstract_expressions.md)
-   4. [Transactions](transactions.md)

doc/hackers-guide/abstract_expressions.md

@@ -1,192 +0,0 @@
-# Data Marshalling Strategies
-
-The runtime is designed to be used from a high-level programming language, which means that there are frequent foreign calls between the host language and C. This also implies that all the data must be frequently marshalled between the binary representations of the two languages. This is usually trivial and well supported for primitive types like numbers and strings but for complex data structures we need to design our own strategy.
-
-The most central data structure in GF is of course the abstract syntax expression. The other two secondary but closely related structures are types and literals. These are complex structures and no high-level programming language will let us to manipulate them directly unless if they are in the format that the runtime of the language understands. There are three main strategies to deal with complex data accross a language boundry:
-
-1. Keep the data in the C world and provide only an opaque handle to the host language. This means that all operations over the data must be done in C via foreign calls.
-2. Design a native host-language representation. For each foreign call the data is copied from the host language to the C representation and vice versa. Copying is obviously bad, but not too bad if the data is small. The added benefit is that now both languages have first-class access to the data. As a bonus, the garbage collector of the host language now understands the data and can immediately release it if part of it becomes unreachable.
-3. Keep the data in the host language. The C code has only an indirect access via opaque handles and calls back to the host language. The program in the host language has first-class access and the garbage collector can work with the data. No copying is needed.
-
-The old C runtime used option 1. Obviously, this means that abstract expressions cannot be manipulated directly, but this is not the only problem. When the application constructs abstract expressions from different pieces, a whole a lot of overhead is added. First, the design was such that data in C must always be allocated from a memory pool. This means that even if we want to make a simple function application, we first must allocate a pool which adds memory overhead. In addition, the host language must allocate an object which wraps arround the C structure. The net effect is that while the plain abstract function application requires the allocation of only two pointers, the actually allocated data may be several times bigger if the application builds the expression piece by piece. The situation is better if the expression is entirely created from the runtime and the application just needs to keep a reference to it.
-
-Another problem is that when the runtime has to create a whole bunch of expressions, for instance as a result from parsing or random and exhaustive generation, then all the expressions are allocated in the same memory pool. The application gets separate handles to each of the produced expressions, but the memory pool is released only after all of the handles become unreachable. Obviously the problem here is that different expressions share the same pool. Unfortunately this is hard to avoid since although the expressions are different, they usually share common subexpression. Identifying the shared parts would be expensive and at the end it might mean that each expression node must be allocated in its own pool.
-
-The path taken in the new runtime is a combination of strategies 2 and 3. The abstract expressions are stored in the heap of the host language and use a native for that language representation.
-
-# Abstract Expressions in Different Languages
-
-In Haskell, abstract expressions are represented with an algebraic data type:
-```Haskell
-data Expr =
-   EAbs BindType Var Expr
- | EApp Expr Expr
- | ELit Literal
- | EMeta  MetaId
- | EFun   Fun
- | EVar   Int
- | ETyped Expr Type
- | EImplArg Expr
-```
-while in Python and all other object-oriented languages an expression is represented with objects of different classes:
-```Python
-class Expr: pass
-class ExprAbs(Expr): pass
-class ExprApp(Expr): pass
-class ExprLit(Expr): pass
-class ExprMeta(Expr): pass
-class ExprFun(Expr): pass
-class ExprVar(Expr): pass
-class ExprTyped(Expr): pass
-class ExprImplArg(Expr): pass
-```
-
-The runtime needs its own representation as well but only when an expression is stored in a .ngf file. This happens for instance with all types in the abstract syntax of the grammar. Since the type system allows dependent types, some type signature might contain expressions too. Another appearance for abstract expressions is in function definitions, i.e. in the def rules.
-
-Expressions in the runtime are represented with C structures which on the other hand may contain tagged references to other structures. The lowest four bits of each reference encode the type of structure that it points to, while the rest contain the file offsets in the memory mapped file. For example, function application is represented as:
-```C++
-struct PgfExprApp {
-  static const uint8_t tag = 1;
-
-  PgfExpr fun;
-  PgfExpr arg;
-};
-```
-Here the constant `tag` says that any reference to a PgfExprApp structure must contain the value 1 in its lowest four bits. The fields `fun` and `arg` refer to the function and the argument for that application. The type PgfExpr is defined as:
-```C++
-typedef uintptr_t object;
-typedef object PgfExpr;
-```
-In order to dereference an expression, we first neeed to pattern match and then obtain a `ref<>` object:
-```C++
-switch (ref<PgfExpr>::get_tag(e)) {
-...
-case PgfExprApp::tag: {
-    auto eapp = ref<PgfExprApp>::untagged(e);
-    // do something with eapp->fun and eapp->arg
-    ...
-    break;
-}
-...
-}
-```
-
-The representation in the runtime is internal and should never be exposed to the host language. Moreover, these structures live in the memory mapped file and as we discussed in Section "[Memory Model](memory_model.md)" accessing them requires special care. This also means that occasionally the runtime must make a copy from the native representation to the host representation and vice versa. For example, function:
-```Haskell
-functionType :: PGF -> Fun -> Maybe Type
-```
-must look up the type of an abstract syntax function in the .ngf file and return its type. The type, however, is in the native representation and it must first be copied in the host representation. The converse also happens. When the compiler wants to add a new abstract function to the grammar, it creates its type in the Haskell heap, which the runtime later copies to the native representation in the .ngf file. This is not much different from any other database. The database file usually uses a different data representation than what the host language has.
-
-In most other runtime operations, copying is not necessary. The only thing that the runtime needs to know is how to create new expressions in the heap of the host and how to pattern match on them. For that it calls back to code implemented differently for each host language. For example in:
-```Haskell
-readExpr :: String -> Maybe Expr
-```
-the runtime knows how to read an abstract syntax expression, while for the construction of the actual value it calls back to Haskell. Similarly:
-```Haskell
-showExpr :: [Var] -> Expr -> String
-```
-uses code implemented in Haskell to pattern match on the different algebraic constructors, while the text generation itself happens inside the runtime.
-
-# Marshaller and Unmarshaller
-
-The marshaller and the unmarshaller are the two key data structures which bridge together the different representation realms for abstract expressions and types. The structures have two equivalent definitions, one in C++:
-```C++
-struct PgfMarshaller {
-    virtual object match_lit(PgfUnmarshaller *u, PgfLiteral lit)=0;
-    virtual object match_expr(PgfUnmarshaller *u, PgfExpr expr)=0;
-    virtual object match_type(PgfUnmarshaller *u, PgfType ty)=0;
-};
-
-struct PgfUnmarshaller {
-    virtual PgfExpr eabs(PgfBindType btype, PgfText *name, PgfExpr body)=0;
-    virtual PgfExpr eapp(PgfExpr fun, PgfExpr arg)=0;
-    virtual PgfExpr elit(PgfLiteral lit)=0;
-    virtual PgfExpr emeta(PgfMetaId meta)=0;
-    virtual PgfExpr efun(PgfText *name)=0;
-    virtual PgfExpr evar(int index)=0;
-    virtual PgfExpr etyped(PgfExpr expr, PgfType typ)=0;
-    virtual PgfExpr eimplarg(PgfExpr expr)=0;
-    virtual PgfLiteral lint(size_t size, uintmax_t *v)=0;
-    virtual PgfLiteral lflt(double v)=0;
-    virtual PgfLiteral lstr(PgfText *v)=0;
-    virtual PgfType dtyp(int n_hypos, PgfTypeHypo *hypos,
-                         PgfText *cat,
-                         int n_exprs, PgfExpr *exprs)=0;
-    virtual void free_ref(object x)=0;
-};
-```
-and one in C:
-```C
-typedef struct PgfMarshaller PgfMarshaller;
-typedef struct PgfMarshallerVtbl PgfMarshallerVtbl;
-struct PgfMarshallerVtbl {
-    object (*match_lit)(PgfUnmarshaller *u, PgfLiteral lit);
-    object (*match_expr)(PgfUnmarshaller *u, PgfExpr expr);
-    object (*match_type)(PgfUnmarshaller *u, PgfType ty);
-};
-struct PgfMarshaller {
-    PgfMarshallerVtbl *vtbl;
-};
-
-typedef struct PgfUnmarshaller PgfUnmarshaller;
-typedef struct PgfUnmarshallerVtbl PgfUnmarshallerVtbl;
-struct PgfUnmarshallerVtbl {
-    PgfExpr (*eabs)(PgfUnmarshaller *this, PgfBindType btype, PgfText *name, PgfExpr body);
-    PgfExpr (*eapp)(PgfUnmarshaller *this, PgfExpr fun, PgfExpr arg);
-    PgfExpr (*elit)(PgfUnmarshaller *this, PgfLiteral lit);
-    PgfExpr (*emeta)(PgfUnmarshaller *this, PgfMetaId meta);
-    PgfExpr (*efun)(PgfUnmarshaller *this, PgfText *name);
-    PgfExpr (*evar)(PgfUnmarshaller *this, int index);
-    PgfExpr (*etyped)(PgfUnmarshaller *this, PgfExpr expr, PgfType typ);
-    PgfExpr (*eimplarg)(PgfUnmarshaller *this, PgfExpr expr);
-    PgfLiteral (*lint)(PgfUnmarshaller *this, size_t size, uintmax_t *v);
-    PgfLiteral (*lflt)(PgfUnmarshaller *this, double v);
-    PgfLiteral (*lstr)(PgfUnmarshaller *this, PgfText *v);
-    PgfType (*dtyp)(PgfUnmarshaller *this,
-                    int n_hypos, PgfTypeHypo *hypos,
-                    PgfText *cat,
-                    int n_exprs, PgfExpr *exprs);
-    void (*free_ref)(PgfUnmarshaller *this, object x);
-};
-struct PgfUnmarshaller {
-    PgfUnmarshallerVtbl *vtbl;
-};
-```
-Which one you will get, depends on whether you import `pgf/pgf.h` from C or C++.
-
-As we can see, most of the arguments for the different methods are of type `PgfExpr`, `PgfType` or `PgfLiteral`. These are all just type synonyms for the type `object`, which on the other hand is nothing else but a number with enough bits to hold an address if necessary. The interpretation of the number depends on the realm in which the object lives. The following table shows the interpretations for four languages as well as the one used internally in the .ngf files:
-|          | PgfExpr        | PgfLiteral        | PgfType        |
-|----------|----------------|-------------------|----------------|
-| Haskell  | StablePtr Expr | StablePtr Literal | StablePtr Type |
-| Python   | ExprObject *   | PyObject *        | TypeObject *   |
-| Java     | jobject        | jobject           | jobject        |
-| .NET     | GCHandle       | GCHandle          | GCHandle       |
-| internal | file offset    | file offset       | file offset    |
-
-The marshaller is the structure that lets the runtime to pattern match on an expression. When one of the match methods is executed, it checks the kind of expr, literal or type and calls the corresponding method from the unmarshaller which it gets as an argument. The method on the other hand gets as arguments the corresponding sub-expressions and attributes.
-
-Generally the role of an unmarshaller is to construct things. For example, the variable `unmarshaller` in `PGF2.FFI` is an object which can construct new expressions in the Haskell heap from the already created children. Function `readExpr`, for instance, passes that one to the runtime to instruct it that the result must be in the Haskell realm.
-
-Constructing objects is not the only use of an unmarshaller. The implementation of `showExpr` passes to `pgf_print_expr` an abstract expression in Haskell and the `marshaller` defined in PGF2.FFI. That marshaller knows how to pattern match on Haskell expressions and calls the right methods from whatever unmarhaller is given to it. What it will get in that particular case is a special unmarshaller which does not produce new representations of abstract expressions, but generates a string.
-
-
-# Literals
-
-Finally, we should have a few remarks about how values of the literal types `String`, `Int` and `Float` are represented in the runtime.
-
-`String` is represented as the structure:
-```C
-typedef struct {
-    size_t size;
-    char text[];
-} PgfText;
-```
-Here the first field is the size of the string in number of bytes. The second field is the string itself, encoded in UTF-8. Just like in most modern languages, the string may contain the zero character and that is not an indication for end of string. This means that functions like `strlen` and `strcat` should never be used when working with PgfText. Despite that the text is not zero terminated, the runtime always allocates one more last byte for the text content and sets it to zero. That last byte is not included when calculating the field `size`. The purpose is that with that last zero byte the GDB debugger knows how to show the string properly. Most of the time, this doesn't incur any memory overhead either since `malloc` always allocates memory in size divisible by the size of two machine words. The consequence is that usually there are some byte left unused at the end of every string anyway.
-
-`Int` is like the integers in Haskell and Python and can have arbitrarily many digits. In the runtime, the value is represented as an array of `uintmax_t` values. Each of these values contains as many decimal digits as it is possible to fit in `uintmax_t`. For example on a 64-bit machine, 
-the maximal value that fits is 18446744073709551616. However, the left-most digit here is at most 1, this means that if we want to represend an arbitrary sequence of digits, the maximal length of the sequence must be at most 19. Similarly on a 32-bit machine each value in the array will store 9 decimal digits. Finally the sign of the number is stored as the sign of the first number in the array which is always threated as `intmax_t`.
-
-Just to have an example, the number `-774763251095801167872` is represented as the array `{-77, 4763251095801167872}`. Note that this representation is not at all suitable for implementing arithmetics with integers, but is very simple to use for us since the runtime only needs to to parse and linearize numbers.
-
-`Float` is trivial and is just represented as the type `double` in C/C++. This can also be seen in the type of the method `lflt` in the unmarshaller.
-

doc/hackers-guide/memory_model.md

@@ -1,136 +0,0 @@
-# The different storage files
-
-The purpose of the `.ngf` files is to be used as on-disk databases that store grammars. Their format is platform-dependent and they should not be copied from
-one platform to another. In contrast the `.pgf` files are platform-independent and can be moved around. The runtime can import a `.pgf` file and create an `.ngf` file.
-Conversely a `.pgf` file can be exported from an already existing `.ngf` file.
-
-The internal relation between the two files is more interesting. The runtime uses its own memory allocator which always allocates memory from a memory mapped file.
-The file may be explicit or an anonymous one. The `.ngf` is simply a memory image saved in a file. This means that loading the file is always immediate.
-You just create a new mapping and the kernel will load memory pages on demand.
-
-On the other hand a `.pgf` file is a version of the grammar serialized in a platform-independent format. This means that loading this type of file is always slower.
-Fortunately, you can always create an `.ngf` file from it to speed up later reloads.
-
-The runtime has three ways to load a grammar:
-
-#### 1. Loading a `.pgf`
-```Haskell
-readPGF :: FilePath -> IO PGF
-```
-This loads the `.pgf` into an anonymous memory-mapped file. In practice, this means that instead of allocating memory from an explicit file, the runtime will still
-use the normal swap file.
-
-#### 2. Loading a `.pgf` and booting a new `.ngf`
-```Haskell
-bootPGF :: FilePath -> FilePath -> IO PGF
-```
-The grammar is loaded from a `.pgf` (the first argument) and the memory is mapped to an explicit `.ngf` (second argument). The `.ngf` file is created by the function
-and a file with the same name should not exist before the call.
-
-#### 3. Loading an existing memory image
-```Haskell
-readNGF :: FilePath -> IO PGF
-```
-Once an `.ngf` file exists, it can be mapped back to memory by using this function. This call is always guaranteed to be fast. The same function can also
-create new empty `.ngf` files. If the file does not exist, then a new one will be created which contains an empty grammar. The grammar could then be extended
-by dynamically adding functions and categories.
-
-# The content of an `.ngf` file
-
-The `.ngf` file is a memory image but this is not the end of the story. The problem is that there is no way to control at which address the memory image would be
-mapped. On Posix systems, `mmap` takes as hint the mapping address but the kernel may choose to ignore it. There is also the flag `MAP_FIXED`, which makes the hint
-into a constraint, but then the kernel may fail to satisfy the constraint. For example that address may already be used for something else. Furthermore, if the
-same file is mapped from several processes (if they all load the same grammar), it would be difficult to find an address which is free in all of them.
-Last but not least using `MAP_FIXED` is considered a security risk.
-
-Since the start address of the mapping can change, using traditional memory pointers withing the mapped area is not possible. The only option is to use offsets
-relative to the beginning of the area. In other words, if normally we would have written `p->x`, now we have the offset `o` which we must use like this:
-```C++
-((A*) (current_base+o))->x
-```
-
-Writing the explicit pointer arithmetics and typecasts, each time when we dereference a pointer, is not better than Vogon poetry and it
-becomes worse when using a chain of arrow operators. The solution is to use the operator overloading in C++.
-There is the type `ref<A>` which wraps around a file offset to a data item of type `A`. The operators `->` and `*`
-are overloaded for the type and they do the necessary pointer arithmetics and type casts.
-
-This solves the problem with code readability but creates another problem. How do `->` and `*` know the address of the memory mapped area? Obviously,
-`current_base` must be a global variable and there must be a way to initialize it. More specifically it must be thread-local to allow different threads to
-work without collisions.
-
-A database (a memory-mapped file) in the runtime is represented by the type `DB`. Before any of the data in the database is accessed, the database must
-be brought into scope. Bringing into scope means that `current_base` is initialized to point to the mapping area for that database. After that any dereferencing
-of a reference will be done relative to the corresponding database. This is how scopes are defined:
-```C++
-{
-    DB_scope scope(db, READER_SCOPE);
-    ...
-}
-```
-Here `DB_scope` is a helper type and `db` is a pointer to the database that you want to bring into scope. The constructor for `DB_scope` saves the old value
-for `current_base` and then sets it to point to the area of the given database. Conversely, the destructor restores the previous value.
-
-The use of `DB_scope` is reentrant, i.e. you can do this:
-```C++
-{
-    DB_scope scope(db1, READER_SCOPE);
-    ...
-    {
-        DB_scope scope(db2, READER_SCOPE);
-        ...
-    }
-    ...
-}
-```
-What you can't do is to have more than one database in scope simultaneously. Fortunately, that is not needed. All API functions start a scope
-and the internals of the runtime always work with the current database in scope.
-
-Note the flag `READER_SCOPE`. You can use either `READER_SCOPE` or `WRITER_SCOPE`. In addition to selecting the database, the `DB_scope` also enforces
-the single writer/multiple readers policy. The main problem is that a writer may have to enlarge the current file, which consequently may mean
-that the kernel should relocate the mapping area to a new address. If there are readers at the same time, they may break since they expect that the mapped
-area is at a particular location.
-
-# Developing writers
-
-There is one important complication when developing procedures modifying the database. Every call to `DB::malloc` may potentially have to enlarge the mapped area
-which sometimes leads to changing `current_base`. That would not have been a problem if GCC was not sometimes caching variables in registers. Look at the following code:
-```C++
-p->r = foo();
-```
-Here `p` is a reference which is used to access another reference `r`. On the other hand, `foo()` is a procedure which directly or indirectly calls `DB::malloc`.
-GCC compiles assignments by first computing the address to modify, and then it evaluates the right hand side. This means that while `foo()` is being evaluated the address computed on the left-hand side is saved in a register or somewhere in the stack. But now, if it happens that the allocation in `foo()` has changed
-`current_base`, then the saved address is no longer valid.
-
-That first problem is solved by overloading the assignment operator for `ref<A>`:
-```C++
-ref<A>& operator= (const ref<A>& r) {
-    offset = r.offset;
-    return *this;
-}
-```
-On first sight, nothing special happens here and it looks like the overloading is redundant. However, now the assignments are compiled in a very different way.
-The overloaded operator is inlined, so there is no real method call and we don't get any overhead. The real difference is that now, whatever is on the left-hand side of the assignment becomes the value of the `this` pointer, and `this` is always the last thing to be evaluated in a method call. This solves the problem.
-`foo()` is evaluated first and if it changes `current_base`, the change will be taken into account when computing the left-hand side of the assignment.
-
-Unfortunately, this is not the only problem. A similar thing happens when the arguments of a function are calls to other functions. See this:
-```C++
-foo(p->r,bar(),q->r)
-```
-Where now `bar()` is the function that performs allocation. The compiler is free to keep in a register the value of `current_base` that it needs for the evaluation of
-`p->r`, while it evaluates `bar()`. But if `current_base` has changed, then the saved value would be invalid while computing `q->r`. There doesn't seem to be
-a work around for this. The only solution is to:
-
-**Never call a function that allocates as an argument to another function**
-
-Instead we call allocating functions on a separate line and we save the result in a temporary variable.
-
-
-# Thread-local variables
-
-A final remark is the compilation of thread-local variables. When a thread-local variable is compiled in a position-dependent code, i.e. in executables, it is
-compiled efficiently by using the `fs` register which points to the thread-local segment. Unfortunately, that is not the case by default for shared
-libraries like our runtime. In that case, GCC applies the global-dynamic model which means that access to a thread local variable is internally implemented
-with a call to the function `__tls_get_addr`. Since `current_base` is used all the time, this adds overhead.
-
-The solution is to define the variable with the attribute `__attribute__((tls_model("initial-exec")))` which says that it should be treated as if it is defined
-in an executable. This removes the overhead, but adds the limitation that the runtime should not be loaded with `dlopen`.

doc/hackers-guide/transactions.md

@@ -1,137 +0,0 @@
-# Transactions
-
-The `.ngf` files that the runtime creates are actual databases which are used to get quick access to the grammars. Like in any database, we also make it possible to dynamically change the data. In our case this means that we can add and remove functions and categories at any time. Moreover, any changes happen in transactions which ensure that changes are not visible until the transaction is commited. The rest of the document describes how the transactions are implemented.
-
-# Databases and Functional Languages
-
-The database model of the runtime is specifically designed to be friendly towards pure functional languages like Haskell. In a usual database, updates happen constantly and therefore executing one and the same query at different times would yield different results. In our grammar databases, queries correspond to operations like parsing, linearization and generation. This means that if we had used the usual database model, all these operations would have to be bound to the IO monad. Consider this example:
-```Haskell
-main = do
-  gr <- readNGF "Example.ngf"
-  functionType gr "f" >>= print
-  -- modify the grammar gr
-  functionType gr "f" >>= print
-```
-Here we ask for the type of a function before and after an arbitrary update in the grammar `gr`. Obviously if we allow that, then `functionType` would have to be in the IO monad, e.g.:
-
-```Haskell
-functionType :: PGF -> Fun -> IO Type
-```
-
-Although this is a possible way to go, it would mean that the programmer would have to do all grammar related work in the IO. This is not nice and against the spirit of functional programming. Moreover, all previous implementations of the runtime have assumed that most operations are pure. If we go along that path then this will cause a major breaking change.
-
-Fortunately there is an alternative. Read-only operations remain pure functions, but any update should create a new revision of the database rather than modifying the existing one. Compare this example with the previous:
-```Haskell
-main = do
-  gr <- readNGF "Example.ngf"
-  print (functionType gr "f")
-  gr2 <- modifyPGF gr $ do
-           -- do all updates here
-  print (functionType gr2 "f")
-```
-Here `modifyPGF` allows us to do updates but the updates are performed on a freshly created clone of the grammar `gr`. The original grammar is never ever modified. After the changes the variable `gr2` is a reference to the new revision. While the transaction is in progress we cannot see the currently changing revision, and therefore all read-only operations can remain pure. Only after the transaction is complete, do we get to use `gr2`, which will not allowed to change anymore.
-
-Note also that above `functionType` is used with its usual pure type:
-```Haskell
-functionType :: PGF -> Fun -> Type
-```
-This is safe since the API never exposes database revisions which are not complete. Furthermore, the programmer is free to keep several revisions of the same database simultaneously. In this example:
-```Haskell
-main = do
-  gr <- readNGF "Example.ngf"
-  gr2 <- modifyPGF gr $ do
-           -- do all updates here
-  print (functionType gr "f", functionType gr2 "f")
-```
-The last line prints the type of function `"f"` in both the old and the new revision. Both are still available.
-
-The API as described so far would have been complete if all updates were happening in a single thread. In reality we can expect that there might be several threads or processes modifying the database. The database ensures a multiple readers/single writer exclusion but this doesn't mean that another process/thread cannot modify the database while the current one is reading an old revision. In a parallel setting, `modifyPGF` first merges the revision which the process is using with the latest revision in the database. On top of that the specified updates are performed. The final revision after the updates is returned as a result.
-
-**TODO: Merges are still not implemented.**
-
-The process can also ask for the latest revision by calling `checkoutPGF`, see bellow.
-
-# Databases and Imperative Languages
-
-In imperative languages, the state of the program constantly changes and the considerations in the last section do not apply. All read-only operations always work with the latest revision. Bellow is the previous example translated to Python:
-```Python
-gr = readNGF("Example.ngf")
-print(functionType(gr,"f"))
-with gr.transaction() as t:
-  # do all updates here by using t
-print(functionType(gr,"f"))
-```
-Here the first call to `functionType` returns the old type of "f", while the second call retrives the type after the updates. The transaction itself is initiated by the `with` statement. Inside the with statement `gr` will still refer to the old revision since the new one is not complete yet. If the `with` statement is finished without exceptions then `gr` is updated to point to the new one. If an exception occurs then the new revision is discarded, which corresponds to a transaction rollback. Inside the `with` block, the object `t` of type `Transaction` provides methods for modifying the data.
-
-# Branches
-
-Since the database already supports revisions, it is a simple step to support branches as well. A branch is just a revision with a name. When you open a database with `readNGF`, the runtime looks up and returns the revision (branch) with name `master`. There might be other branches as well. You can retrieve a specific branch by calling:
-```Haskell
-checkoutPGF :: PGF -> String -> IO (Maybe PGF)
-```
-Here the string is the branch name. New branches can be created by using:
-```Haskell
-branchPGF :: PGF -> String -> Transaction a -> IO PGF
-```
-Here we start with an existing revision, apply a transaction and store the result in a new branch with the given name.
-
-# Implementation
-
-In this section we summarize important design decisions related to the internal implementation.
-
-## API
-The low-level API for transactions consists of only four functions:
-```C
-PgfRevision pgf_clone_revision(PgfDB *db, PgfRevision revision,
-                               PgfText *name,
-                               PgfExn *err);
-
-void pgf_free_revision(PgfDB *pgf, PgfRevision revision);
-
-void pgf_commit_revision(PgfDB *db, PgfRevision revision,
-                         PgfExn *err);
-
-PgfRevision pgf_checkout_revision(PgfDB *db, PgfText *name,
-                                  PgfExn *err);
-```
-Here `pgf_clone_revision` makes a copy of an existing revision and — if `name` is not `NULL` — changes its name. The new revision is transient and exists only until it is released with `pgf_free_revision`. Transient revisions can be updated with the API for adding functions and categories. To make a revision persistent, call `pgf_commit_revision`. After the revision is made persistent it will stay in the database even after you call `pgf_free_revision`. Moreover, it will replace the last persistent revision with the same name. The old revision will then become transient and will exist only until all clients call `pgf_free_revision` for it.
-
-Persistent revisions can never be updated. Instead you clone it to create a new transient revision. That one is updated and finally it replaces the existing persistent revision.
-
-This design for transactions may sound unusual but it is just another way to present the copy-on-write strategy. There instead of transaction logs, each change to the data is written in a new place and the result is made available only after all changes are in place. This is for instance what the [LMDB](http://www.lmdb.tech/doc/) (Lightning Memory-Mapped Database) does and it has also served as an inspiration for us.
-
-## Functional Data Structures
-
-From an imperative point of view, it may sound wasteful that a new copy of the grammar is created for each transaction. Functional programmers on the other hand know that with a functional data structure, you can make a copy which shares as much of the data with the original as possible. Each new version copies only those bits that are different from the old one. For example the main data structure that we use to represent the abstract syntax of a grammar is a size-balanced binary tree as described by:
-
-- Stephen Adams, "Efficient sets: a balancing act", Journal of Functional Programming 3(4):553-562, October 1993, http://www.swiss.ai.mit.edu/~adams/BB/.
-
-- J. Nievergelt and E.M. Reingold, "Binary search trees of bounded balance", SIAM journal of computing 2(1), March 1973.
-
-This is also the same algorithm used by Data.Map in Haskell. There are also other possible implementations (B-Trees for instance), and they may be considered if the current one turns our too inefficient.
-
-
-## Garbage Collection
-
-We use reference counting to keep track of which objects should be kept alive. For instance, `pgf_free_revision` knows that a transient revision should be removed only when its reference count reaches zero. This means that there is no process or thread using it. The function also checks whether the revision is persistent. Persistent revisions are never removed since they can always be retrieved with `checkoutPGF`.
-
-Clients are supposed to correctly use `pgf_free_revision` to indicate that they don't need a revision any more. Unfortunately, this is not always possible to guarantee. For example many languages with garbage collection call `pgf_free_revision` from a finalizer method. In some languages, however, the finalizer is not guaranteed to be executed if the process terminates before the garbage collection is done. Haskell is one of those languages. Even in languages with reference counting like Python, the process may get killed by the operating system and then the finalizer may still not be executed.
-
-The solution is that we count on the database clients to correctly report when a revision is not needed. In addition, to be on the safe side, on a fresh database restart we explictly clean all leftover transient revisions. This means that even if a client is killed or if it does not correctly release its revisions, the worst that can happen is a memory leak until the next restart. Here by fresh restart we mean a situation where a process opens a database which is not used by anyone else. In order to detect that case we maintain a list of processes who currently have access to the file. While a new process is added, we also remove all processes in the list who are not alive anymore. If at the end the list contains only one element, then this is a fresh restart.
-
-## Inter-process Communication
-
-One and the same database may be opened by several processes. In that case, each process creates a mapping of the database into his own address space. The mapping is shared, which means that if a page from the database gets loaded in memory, it is loaded in a single place in the physical memory. The physical memory is then assigned possibly different virtual addresses in each process. All processes can read the data simultaneously, but if we let them to change it at the same time, all kinds of problems may happen. To avoid that, we store a single-writer/multiple-readers lock in the database file, which the processes use for synchronization.
-
-## Atomicity
-
-The transactions serve two goals. First they make it possible to isolate readers from seeing unfinished changes from writers. Second, they ensure atomicity. A database change should be either completely done or not done at all. The use of transient revisions ensures the isolation but the atomicity is only partly taken care of.
-
-Think about what happens when a writer starts updating a transient revision. All the data is allocated in a memory mapped file. From the point of view of the runtime, all changes happen in memory. When all is done, the runtime calls `msync` which tells the kernel to flush all dirty pages to disk. The problem is that the kernel is also free to flush pages at any time. For instance, if there is not enough memory, it may decide to swap out pages earlier and reuse the released physical space to swap in other virtual pages. This would be fine if the transaction eventually succeeds. However, if this doesn't happen then the image in the file is already changed.
-
-We can avoid the situation by calling [mlock](https://man7.org/linux/man-pages/man2/mlock.2.html) and telling the kernel that certain pages should not be swapped out. The question is which pages to lock. We can lock them all, but this is too much. That would mean that as soon as a page is touched it will never leave the physical memory. Instead, it would have been nice to tell the kernel -- feel free to swap out clean pages but, as soon as they get dirty, keep them in memory until further notice. Unfortunately there is no way to do that directly.
-
-The work around is to first use [mprotect](https://man7.org/linux/man-pages/man2/mprotect.2.html) and keep all pages as read-only. Any attempt to change a page will cause segmentation fault which we can capture. If the change happens during a transaction then we can immediate lock the page and add it to the list of modified pages. When a transaction is successful we sync all modified pages. If an attempt to change a page happens outside of a transaction, then this is either a bug in the runtime or the client is trying to change an address which it should not change. In any case this prevents unintended changes in the data.
-
-
-**TODO: atomicity is not implemented yet**

doc/tutorial/gf-tutorial.t2t

@@ -898,7 +898,7 @@ Parentheses are only needed for grouping.
 Parsing something that is not in grammar will fail:
 ```
   > parse "hello dad"
-  The parser failed at token 2: "dad"
+  Unknown words: dad
 
   > parse "world hello"
   no tree found
@@ -2475,7 +2475,7 @@ can be used to read a text and return for each word its analyses
 ```
 The command ``morpho_quiz = mq`` generates inflection exercises.
 ```
-  % gf alltenses/IrregFre.gfo
+  % gf -path=alltenses:prelude $GF_LIB_PATH/alltenses/IrregFre.gfo
 
   > morpho_quiz -cat=V
 
@@ -2488,6 +2488,11 @@ The command ``morpho_quiz = mq`` generates inflection exercises.
   réapparaîtriez
   Score 0/1
 ```
+To create a list for later use, use the command ``morpho_list = ml``
+```
+  > morpho_list -number=25 -cat=V | write_file exx.txt
+```
+
 
 
 
@@ -2646,12 +2651,12 @@ The verb //switch off// is called a
 
 We can define transitive verbs and their combinations as follows:
 ```
-  lincat V2 = {s : Number => Str ; part : Str} ;
+  lincat TV = {s : Number => Str ; part : Str} ;
 
-  fun AppV2 : Item -> V2 -> Item -> Phrase ;
+  fun AppTV : Item -> TV -> Item -> Phrase ;
 
-  lin AppV2 subj v2 obj =
-    {s = subj.s ++ v2.s ! subj.n ++ obj.s ++ v2.part} ;
+  lin AppTV subj tv obj =
+    {s = subj.s ++ tv.s ! subj.n ++ obj.s ++ tv.part} ;
 ```
 
 **Exercise**. Define the language ``a^n b^n c^n`` in GF, i.e.
@@ -2717,11 +2722,11 @@ This topic will be covered in #Rseclexing.
 
 The symbol ``**`` is used for both record types and record objects.
 ```
-  lincat V2 = Verb ** {c : Case} ;
+  lincat TV = Verb ** {c : Case} ;
 
   lin Follow = regVerb "folgen" ** {c = Dative} ;
 ```
-``V2`` (transitive verb) becomes a **subtype** of ``Verb``.
+``TV`` becomes a **subtype** of ``Verb``.
 
 If //T// is a subtype of //R//, an object of //T// can be used whenever
 an object of //R// is required.
@@ -2752,11 +2757,7 @@ Thus the labels ``p1, p2,...`` are hard-coded.
 English indefinite article:
 ```
   oper artIndef : Str =
-     pre {
-       ("a" | "e" | "i" | "o") => "an" ;
-       _ => "a"
-     } ;
-
+    pre {"a" ; "an" / strs {"a" ; "e" ; "i" ; "o"}} ;
 ```
 Thus
 ```
@@ -2947,7 +2948,7 @@ We need the following combinations:
 ```
 We also need **lexical insertion**, to form phrases from single words:
 ```
-  mkCN : N -> CN ;
+  mkCN : N -> NP ;
   mkAP : A -> AP ;
 ```
 Naming convention: to construct a //C//, use a function ``mk``//C//.
@@ -2968,7 +2969,7 @@ can be built as follows:
 ```
   mkCl
     (mkNP these_Det
-       (mkCN (mkAP very_AdA (mkAP warm_A)) (mkCN pizza_N)))
+       (mkCN (mkAP very_AdA (mkAP warm_A)) (mkCN pizza_CN)))
     (mkAP italian_AP)
 ```
 The task now: to define the concrete syntax of ``Foods`` so that
@@ -3717,24 +3718,48 @@ Concrete syntax does not know if a category is a dependent type.
 ```
 Notice that the ``Kind`` argument is suppressed in linearization.
 
-Parsing with dependent types consists of two phases:
+Parsing with dependent types is performed in two phases:
 + context-free parsing
 + filtering through type checker
 
-Parsing a type-correct command works as expected:
 
+By just doing the first phase, the ``kind`` argument is not found:
 ```
   > parse "dim the light"
-  CAction light dim (DKindOne light)
+  CAction ? dim (DKindOne light)
 ```
-However, type-incorrect commands are rejected by the typecheck:
+Moreover, type-incorrect commands are not rejected:
 ```
   > parse "dim the fan"
-  The parsing is successful but the type checking failed with error(s):
-    Couldn't match expected type Device light
-       against the interred type Device fan
-    In the expression: DKindOne fan       
+  CAction ? dim (DKindOne fan)
 ```
+The term ``?`` is a **metavariable**, returned by the parser
+for any subtree that is suppressed by a linearization rule.
+These are the same kind of metavariables as were used #Rsecediting
+to mark incomplete parts of trees in the syntax editor.
+
+
+
+#NEW
+
+===Solving metavariables===
+
+Use the command ``put_tree = pt`` with the option ``-typecheck``:
+```
+  > parse "dim the light" | put_tree -typecheck
+  CAction light dim (DKindOne light)
+```
+The ``typecheck`` process may fail, in which case an error message
+is shown and no tree is returned:
+```
+  > parse "dim the fan" | put_tree -typecheck
+
+  Error in tree UCommand (CAction ? 0 dim (DKindOne fan)) :
+    (? 0 <> fan) (? 0 <> light)
+```
+
+
+
 
 #NEW
 
@@ -3761,19 +3786,23 @@ to express Haskell-type library functions:
     \_,_,_,f,x,y -> f y x ;
 ```
 
+
 #NEW
 
 ===Dependent types: exercises===
 
 1. Write an abstract syntax module with above contents
 and an appropriate English concrete syntax. Try to parse the commands
-//dim the light// and //dim the fan//.
+//dim the light// and //dim the fan//, with and without ``solve`` filtering.
 
-2. Perform random and exhaustive generation.
+
+2. Perform random and exhaustive generation, with and without
+``solve`` filtering.
 
 3. Add some device kinds and actions to the grammar.
 
 
+
 #NEW
 
 ==Proof objects==
@@ -3883,6 +3912,7 @@ fun
 Classes for new actions can be added incrementally.
 
 
+
 #NEW
 
 ==Variable bindings==
@@ -4170,8 +4200,7 @@ We construct a calculator with addition, subtraction, multiplication, and
 division of integers.
 ```
   abstract Calculator = {
-  flags startcat = Exp ;
-  
+
   cat Exp ;
 
   fun
@@ -4197,7 +4226,7 @@ We begin with a
 concrete syntax that always uses parentheses around binary
 operator applications:
 ```
-  concrete CalculatorP of Calculator = open Prelude in {
+  concrete CalculatorP of Calculator = {
 
   lincat
     Exp = SS ;
@@ -4708,6 +4737,10 @@ abstract Query = {
 
 To make it easy to define a transfer function, we export the
 abstract syntax to a system of Haskell datatypes:
+```
+  % gf --output-format=haskell Query.pgf
+```
+It is also possible to produce the Haskell file together with PGF, by
 ```
   % gf -make --output-format=haskell QueryEng.gf
 ```

download/gfc

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+prefix="/usr/local"
+
+case "i386-apple-darwin9.3.0" in
+      *-cygwin)
+          prefix=`cygpath -w "$prefix"`;;
+esac
+
+exec_prefix="${prefix}"
+GF_BIN_DIR="${exec_prefix}/bin"
+GF_DATA_DIR="${prefix}/share/GF-3.0-beta"
+
+GFBIN="$GF_BIN_DIR/gf"
+
+if [ ! -x "${GFBIN}" ]; then
+   GFBIN=`which gf`
+fi
+
+if [ ! -x "${GFBIN}" ]; then
+    echo "gf not found."
+    exit 1
+fi
+
+exec $GFBIN --batch "$@"

download/index-3.11.md

@@ -1,192 +0,0 @@
----
-title: Grammatical Framework Download and Installation
-date: 25 July 2021
----
-
-**GF 3.11** was released on 25 July 2021.
-
-What's new? See the [release notes](release-3.11.html).
-
-#### Note: GF core and the RGL
-
-The following instructions explain how to install **GF core**, i.e. the compiler, shell and run-time systems.
-Obtaining the **Resource Grammar Library (RGL)** is done separately; see the section at the bottom of this page.
-
----
-
-## Installing from a binary package
-
-Binary packages are available for Debian/Ubuntu, macOS, and Windows and include:
-
-- GF shell and grammar compiler
-- `gf -server` mode
-- C run-time system
-- Java & Python bindings to the C run-time system
-
-Unlike in previous versions, the binaries **do not** include the RGL.
-
-[Binary packages on GitHub](https://github.com/GrammaticalFramework/gf-core/releases/tag/3.11)
-
-#### Debian/Ubuntu
-
-There are two versions: `gf-3.11-ubuntu-18.04.deb` for Ubuntu 18.04 (Cosmic), and `gf-3.11-ubuntu-20.04.deb` for Ubuntu 20.04 (Focal).
-
-To install the package use:
-
-```
-sudo apt-get install ./gf-3.11-ubuntu-*.deb
-```
-
-<!-- The Ubuntu `.deb` packages should work on Ubuntu 16.04, 18.04 and similar Linux distributions. -->
-
-#### macOS
-
-To install the package, just double-click it and follow the installer instructions.
-
-The packages should work on at least Catalina and Big Sur.
-
-#### Windows
-
-To install the package, unpack it anywhere.
-
-You will probably need to update the `PATH` environment variable to include your chosen install location.
-
-For more information, see [Using GF on Windows](https://www.grammaticalframework.org/~inari/gf-windows.html) (latest updated for Windows 10).
-
-## Installing from Hackage
-
-_Instructions applicable for macOS, Linux, and WSL2 on Windows._
-
-[GF is on Hackage](http://hackage.haskell.org/package/gf), so under
-normal circumstances the procedure is fairly simple:
-
-```
-cabal update
-cabal install gf-3.11
-```
-
-### Notes
-
-**GHC version**
-
-The GF source code is known to be compilable with GHC versions 7.10 through to 8.10.
-
-**Obtaining Haskell**
-
-There are various ways of obtaining Haskell, including:
-
-- ghcup
-    1.  Install from https://www.haskell.org/ghcup/
-    2.  `ghcup install ghc 8.10.4`
-    3.  `ghcup set ghc 8.10.4`
-- Haskell Platform https://www.haskell.org/platform/
-- Stack https://haskellstack.org/
-
-
-**Installation location**
-
-The above steps install GF for a single user.
-The executables are put in `$HOME/.cabal/bin` (or on macOS in `$HOME/Library/Haskell/bin`),
-so you might want to add this directory to your path (in `.bash_profile` or similar):
-
-```
-PATH=$HOME/.cabal/bin:$PATH
-```
-
-**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 dnf install ghc-haskeline-devel`
-
-## Installing from source code
-
-**Obtaining**
-
-To obtain the source code for the **release**,
-download it from [GitHub](https://github.com/GrammaticalFramework/gf-core/releases).
-
-Alternatively, to obtain the **latest version** of the source code:
-
-1. If you haven't already, clone the repository with:
-```
-git clone https://github.com/GrammaticalFramework/gf-core.git
-```
-2. If you've already cloned the repository previously, update with:
-```
-git pull
-```
-
-
-**Installing**
-
-You can 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 Python bindings from PyPI
-
-The Python library is available on PyPI as `pgf`, so it can be installed using:
-
-```
-pip install pgf
-```
-
-We provide binary wheels for Linux and macOS, which include the C runtime and are ready-to-go.
-If there is no binary distribution for your platform, this will install the source tarball,
-which will attempt to build the binding during installation,
-and requires the GF C runtime to be installed on your system.
-
----
-
-## Installing the RGL from a binary release
-
-Binary releases of the RGL are made available on [GitHub](https://github.com/GrammaticalFramework/gf-rgl/releases).
-In general the steps to follow are:
-
-1. Download a binary release and extract it somewhere on your system.
-2. Set the environment variable `GF_LIB_PATH` to point to wherever you extracted the RGL.
-
-## Installing the RGL from source
-
-To compile the RGL, you will need to have GF already installed and in your path.
-
-1. Obtain the RGL source code, either by:
-  - cloning with `git clone https://github.com/GrammaticalFramework/gf-rgl.git`
-  - downloading a source archive [here](https://github.com/GrammaticalFramework/gf-rgl/archive/master.zip)
-2. Run `make` in the source code folder.
-
-For more options, see the [RGL README](https://github.com/GrammaticalFramework/gf-rgl/blob/master/README.md).
-
----
-
-## Older releases
-
-- [GF 3.10](index-3.10.html) (December 2018)
-- [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.html

@@ -1,8 +0,0 @@
-<html>
-<head>
-  <meta http-equiv="refresh" content="0; URL=/download/index-3.11.html" />
-</head>
-<body>
-  You are being redirected to <a href="index-3.11.html">the current version</a> of this page.
-</body>
-</html>

download/index.md

@@ -114,7 +114,7 @@ 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 dnf install ghc-haskeline-devel`
+- On Fedora: `sudo yum install ghc-haskeline-devel`
 
 **GHC version**
 
@@ -171,20 +171,6 @@ 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).
 
-## Installing the Python bindings from PyPI
-
-The Python library is available on PyPI as `pgf`, so it can be installed using:
-
-```
-pip install pgf
-```
-
-We provide binary wheels for Linux and OSX (with Windows missing so far), which 
-include the C runtime and a ready-to-go.  If there is no binary distribution for
-your platform, this will install the source tarball, which will attempt to build 
-the binding during installation, and requires the GF C runtime to be installed on
-your system.
-
 ## Older releases
 
 - [GF 3.9](index-3.9.html) (August 2017)

download/release-3.11.md

@@ -1,43 +0,0 @@
----
-title: GF 3.11 Release Notes
-date: 25 July 2021
----
-
-## Installation
-
-See the [download page](index-3.11.html).
-
-## What's new
-
-From this release, the binary GF core packages do not contain the RGL.
-The RGL's release cycle is now completely separate from GF's. See [RGL releases](https://github.com/GrammaticalFramework/gf-rgl/releases).
-
-Over 500 changes have been pushed to GF core
-since the release of GF 3.10 in December 2018.
-
-## General
-
-- Make the test suite work again.
-- Compatibility with new versions of GHC, including multiple Stack files for the different versions.
-- Support for newer version of Ubuntu 20.04 in the precompiled binaries.
-- Updates to build scripts and CI workflows.
-- Bug fixes and code cleanup.
-
-## GF compiler and run-time library
-
-- Add CoNLL output to `visualize_tree` shell command.
-- Add canonical GF as output format in the compiler.
-- Add PGF JSON as output format in the compiler.
-- Deprecate JavaScript runtime in favour of updated [TypeScript runtime](https://github.com/GrammaticalFramework/gf-typescript).
-- Improvements in time & space requirements when compiling certain grammars.
-- Improvements to Haskell export.
-- Improvements to the GF shell.
-- Improvements to canonical GF compilation.
-- Improvements to the C runtime.
-- Improvements to `gf -server` mode.
-- Clearer compiler error messages.
-
-## Other
-
-- Web page and documentation improvements.
-- Add WordNet module to GFSE.

gf.cabal

@@ -1,22 +1,22 @@
 name: gf
-version: 4.0.0
+version: 3.10.3-git
 
-cabal-version: 1.22
-build-type: Simple
+cabal-version: >= 1.22
+build-type: Custom
 license: OtherLicense
 license-file: LICENSE
 category: Natural Language Processing, Compiler
 synopsis: Grammatical Framework
 description: GF, Grammatical Framework, is a programming language for multilingual grammar applications
-maintainer: John J. Camilleri <john@digitalgrammars.com>
-homepage: https://www.grammaticalframework.org/
+homepage: http://www.grammaticalframework.org/
 bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
-tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4, GHC==9.0.2
+maintainer: Thomas Hallgren
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
 
+data-dir: src
 data-files:
   www/*.html
   www/*.css
-  www/Logos/gf0.png
   www/P/*.png
   www/gfse/*.html
   www/gfse/*.css
@@ -39,26 +39,39 @@ data-files:
   www/translator/*.css
   www/translator/*.js
 
+custom-setup
+  setup-depends:
+    base,
+    Cabal >=1.22.0.0,
+    directory,
+    filepath,
+    process >=1.0.1.1
+
+--source-repository head
+--  type:     darcs
+--  location: http://www.grammaticalframework.org/
+
 source-repository head
-  type: git
+  type:     git
   location: https://github.com/GrammaticalFramework/gf-core.git
 
 flag interrupt
   Description: Enable Ctrl+Break in the shell
-  Default: True
+  Default:     True
 
 flag server
   Description: Include --server mode
-  Default: True
+  Default:     True
 
 flag network-uri
    description: Get Network.URI from the network-uri package
    default: True
 
-library
+executable gf
+  hs-source-dirs: src/programs
+  main-is: gf-main.hs
   default-language:    Haskell2010
-  hs-source-dirs: api
-  build-depends: pgf2 >= 4.0.0,
+  build-depends: pgf2,
                  base >= 4.6 && <5,
                  array,
                  containers,
@@ -67,30 +80,34 @@ library
                  random,
                  pretty,
                  mtl,
+                 exceptions,
                  ghc-prim,
                  filepath, directory>=1.2, time,
                  process, haskeline, parallel>=3, json
-  build-tool-depends: alex:alex >= 3.2.4,
-                      happy:happy >= 1.19.9
-  exposed-modules:
-    GF.Interactive
-    GF.Compiler
-    GF.Grammar
-    GF.Term
-    GF.Compile
-    GF.CompileInParallel
-    GF.Data.ErrM
-    GF.Infra.CheckM
-    GF.Infra.Option
-    GF.Infra.UseIO
-    GF.Infra.BuildInfo
+  ghc-options: -threaded
+
+  if impl(ghc>=7.0)
+    ghc-options: -rtsopts -with-rtsopts=-I5
+    if impl(ghc<7.8)
+      ghc-options: -with-rtsopts=-K64M
+
+  ghc-prof-options: -auto-all
+
+  hs-source-dirs: src/compiler
+
+  other-modules:
+    GF
     GF.Support
     GF.Text.Pretty
     GF.Text.Lexing
+    GF.Grammar.Canonical
 
-    GF.CompileOne  GF.Compile.GetGrammar
+    GF.Main GF.Compiler GF.Interactive
 
-    GF.Data.Operations
+    GF.Compile GF.CompileInParallel GF.CompileOne  GF.Compile.GetGrammar
+    GF.Grammar
+
+    GF.Data.Operations GF.Infra.Option GF.Infra.UseIO
 
     GF.Command.Abstract
     GF.Command.CommandInfo
@@ -105,20 +122,25 @@ library
     GF.Command.TreeOperations
     GF.Compile.CFGtoPGF
     GF.Compile.CheckGrammar
-    GF.Compile.Compute.Concrete
-    GF.Compile.Compute.Concrete2
+    GF.Compile.Compute.AppPredefined
+    GF.Compile.Compute.ConcreteNew
+    GF.Compile.Compute.Predef
+    GF.Compile.Compute.Value
     GF.Compile.ExampleBased
     GF.Compile.Export
     GF.Compile.GenerateBC
     GF.Compile.GeneratePMCFG
     GF.Compile.GrammarToPGF
     GF.Compile.Multi
+    GF.Compile.Optimize
     GF.Compile.OptimizePGF
     GF.Compile.PGFtoHaskell
     GF.Compile.PGFtoJava
     GF.Haskell
     GF.Compile.ConcreteToHaskell
     GF.Compile.GrammarToCanonical
+    GF.Grammar.CanonicalJSON
+    GF.Compile.PGFtoJSON
     GF.Compile.ReadFiles
     GF.Compile.Rename
     GF.Compile.SubExOpt
@@ -126,9 +148,13 @@ library
     GF.Compile.ToAPI
     GF.Compile.TypeCheck.Abstract
     GF.Compile.TypeCheck.Concrete
+    GF.Compile.TypeCheck.ConcreteNew
+    GF.Compile.TypeCheck.Primitives
+    GF.Compile.TypeCheck.RConcrete
     GF.Compile.TypeCheck.TC
     GF.Compile.Update
     GF.Data.BacktrackM
+    GF.Data.ErrM
     GF.Data.Graph
     GF.Data.Graphviz
     GF.Data.Relation
@@ -146,12 +172,14 @@ library
     GF.Grammar.Lookup
     GF.Grammar.Macros
     GF.Grammar.Parser
+    GF.Grammar.PatternMatch
     GF.Grammar.Predef
     GF.Grammar.Printer
     GF.Grammar.ShowTerm
     GF.Grammar.Unify
     GF.Grammar.Values
-    GF.Grammar.JSON
+    GF.Infra.BuildInfo
+    GF.Infra.CheckM
     GF.Infra.Concurrency
     GF.Infra.Dependencies
     GF.Infra.GetOpt
@@ -180,12 +208,12 @@ library
     GF.System.Directory
     GF.System.Process
     GF.System.Signal
-    GF.System.NoSignal
     GF.Text.Clitics
     GF.Text.Coding
+    GF.Text.Lexing
     GF.Text.Transliterations
     Paths_gf
-
+    
     -- not really part of GF but I have changed the original binary library
     -- and we have to keep the copy for now.
     Data.Binary
@@ -194,34 +222,28 @@ library
     Data.Binary.Builder
     Data.Binary.IEEE754
 
-  if os(windows)
-    build-depends:
-      Win32 >= 2.3.1.1 && < 2.7
-  else
-    build-depends:
-      terminfo >=0.4.0 && < 0.5,
-      unix >= 2.7.2 && < 2.9
-
   if flag(server)
-    build-depends:
-      http-slim,
-      network>=2.3 && <3.3
+    build-depends: httpd-shed>=0.4.0.3, network>=2.3 && <2.7,
+                   cgi>=3001.2.2.0
     if flag(network-uri)
-      build-depends:
-        network-uri >= 2.6.1.0 && < 2.7,
-        network>=2.6 && <3.3
+      build-depends: network-uri>=2.6, network>=2.6
     else
-      build-depends:
-        network >= 2.5 && <3.3
+      build-depends: network<2.6
 
     cpp-options: -DSERVER_MODE
     other-modules:
       GF.Server
-      GF.Server.Cache
-      GF.Server.PGFService
-      GF.Server.SimpleEditor.Convert
-      GF.Server.SimpleEditor.JSON
-      GF.Server.SimpleEditor.Syntax
+      PGFService
+      RunHTTP
+      SimpleEditor.Convert
+      SimpleEditor.JSON
+      SimpleEditor.Syntax
+      URLEncoding
+      CGI
+      CGIUtils
+      Cache
+      Fold
+    hs-source-dirs: src/server src/server/transfer src/example-based
 
   if flag(interrupt)
     cpp-options: -DUSE_INTERRUPT
@@ -229,23 +251,29 @@ library
   else
     other-modules: GF.System.NoSignal
 
-executable gf
-  main-is: gf-main.hs
-  other-modules:
-      Paths_gf
+  if impl(ghc>=7.8)
+    build-tools: happy>=1.19, alex>=3.1
+  else
+    build-tools: happy, alex>=3
+
+  ghc-options: -fno-warn-tabs
+
+  if os(windows)
+    build-depends: Win32
+  else
+    build-depends: unix, terminfo>=0.4
+
+
+test-suite rgl-tests
+  type:           exitcode-stdio-1.0
+  main-is:        run.hs
+  hs-source-dirs: lib/tests/
+  build-depends:  base, HTF, process, HUnit, filepath, directory
   default-language:    Haskell2010
-  build-depends: base >= 4.6 && <5, directory>=1.2, gf
-  ghc-options: -threaded
 
 test-suite gf-tests
-  type: exitcode-stdio-1.0
-  main-is: run.hs
+  type:           exitcode-stdio-1.0
+  main-is:        run.hs
   hs-source-dirs: testsuite
-  build-depends:
-    base >= 4.9.1 && < 4.16,
-    Cabal >= 1.8,
-    directory >= 1.3.0 && < 1.4,
-    filepath >= 1.4.1 && < 1.5,
-    process >= 1.4.3 && < 1.7
-  build-tool-depends: gf:gf
-  default-language: Haskell2010
+  build-depends:  base>=4.3 && <5, Cabal>=1.8, directory, filepath, process
+  default-language:    Haskell2010

index.html

@@ -8,7 +8,7 @@
 
   <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.15.4/css/all.css" 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>
@@ -22,9 +22,9 @@
   <h4 class="text-black-50">A programming language for multilingual grammar applications</h4>
 </div>
 
-<div class="row mt-4">
+<div class="row my-4">
 
-  <div class="col-sm-6 col-md-3 mb-4">
+  <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>
@@ -39,7 +39,6 @@
         /
         <a href="lib/doc/rgl-tutorial/index.html">RGL Tutorial</a>
       </li>
-      <li><a href="doc/gf-video-tutorials.html">Video Tutorials</a></li>
     </ul>
 
     <a href="download/index.html" class="btn btn-primary ml-3">
@@ -48,7 +47,7 @@
     </a>
   </div>
 
-  <div class="col-sm-6 col-md-3 mb-4">
+  <div class="col-sm-6 col-md-3">
     <h3>Learn more</h3>
 
     <ul class="mb-2">
@@ -56,9 +55,6 @@
       <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>
-      <li><a href="https://www.mitpressjournals.org/doi/pdf/10.1162/COLI_a_00378">Scaling Up (Computational Linguistics 2020)</a></li>
-      <li><a href="https://github.com/GrammaticalFramework/gf-wordnet/blob/master/README.md">GF WordNet</a></li>
-      <li><a href="https://inariksit.github.io/blog/">GF blog</a></li>
     </ul>
 
     <a href="lib/doc/synopsis/index.html" class="btn btn-primary ml-3">
@@ -67,47 +63,27 @@
     </a>
   </div>
 
-  <div class="col-sm-6 col-md-3 mb-4">
+  <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>PGF library API:<br>
-        <a href="http://hackage.haskell.org/package/gf/docs/PGF.html">Haskell</a> /
-        <a href="doc/runtime-api.html">C&nbsp;runtime</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>
-      <li><a href="http://www.grammaticalframework.org/~john/rgl-browser/">RGL source browser</a></li>
     </ul>
   </div>
 
-  <div class="col-sm-6 col-md-3 mb-4">
+  <div class="col-sm-6 col-md-3">
     <h3>Contribute</h3>
     <ul class="mb-2">
-      <li>
-        <a href="https://web.libera.chat/?channels=#gf">
-          <i class="fas fa-hashtag"></i>
-          IRC
-        </a>
-        /
-        <a href="https://discord.gg/EvfUsjzmaz">
-          <i class="fab fa-discord"></i>
-          Discord
-        </a>
-      </li>
-      <li>
-        <a href="https://stackoverflow.com/questions/tagged/gf">
-          <i class="fab fa-stack-overflow"></i>
-          Stack Overflow
-        </a>
-      </li>
-      <li><a href="https://groups.google.com/group/gf-dev">Mailing List</a></li>
+      <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="//school.grammaticalframework.org/2020/">Summer School</a></li>
       <li><a href="doc/gf-people.html">Authors</a></li>
+      <li><a href="//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>
@@ -173,7 +149,7 @@ least one, it may help you to get a first idea of what GF is.
 <div class="row">
 
   <div class="col-md-6">
-    <h2>Applications & availability</h2>
+    <h2>Applications & Availability</h2>
     <p>
     GF can be used for building
     <a href="//cloud.grammaticalframework.org/translator/">translation systems</a>,
@@ -193,7 +169,6 @@ least one, it may help you to get a first idea of what GF is.
     <li>macOS</li>
     <li>Windows</li>
     <li>Android mobile platform (via Java; runtime)</li>
-    <li>iOS mobile platform (iPhone, iPad)</li>
     <li>via compilation to JavaScript, almost any platform that has a web browser (runtime)</li>
     </ul>
 
@@ -233,44 +208,47 @@ least one, it may help you to get a first idea of what GF is.
     </p>
 
     <p>
-    We run the IRC channel <strong><code>#gf</code></strong> on the Libera network, where you are welcome to look for help with small questions or just start a general discussion.
-    You can <a href="https://web.libera.chat/?channels=#gf">open a web chat</a>
-    or <a href="https://www.grammaticalframework.org/irc/?C=M;O=D">browse the channel logs</a>.
+    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="/irc/">browse the channel logs</a>.
     </p>
     <p>
-    There is also a <a href="https://discord.gg/EvfUsjzmaz">GF server on Discord</a>.
-    </p>
-
-    <p>
-    For bug reports and feature requests, please create an issue in the
-    <a href="https://github.com/GrammaticalFramework/gf-core/issues">GF Core</a> or
-    <a href="https://github.com/GrammaticalFramework/gf-rgl/issues">RGL</a> repository.
-
-    For programming questions, consider asking them on <a href="https://stackoverflow.com/questions/tagged/gf">Stack Overflow with the <code>gf</code> tag</a>.
-    If you have a more general question to the community, we recommend you ask it on the <a href="http://groups.google.com/group/gf-dev">mailing list</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>
 
   <div class="col-md-6">
     <h2>News</h2>
+
     <dl class="row">
-      <dt class="col-sm-3 text-center text-nowrap">2021-07-25</dt>
+      <dt class="col-sm-3 text-center text-nowrap">2018-12-03</dt>
       <dd class="col-sm-9">
-        <strong>GF 3.11 released.</strong>
-        <a href="download/release-3.11.html">Release notes</a>
+        <a href="//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">2021-05-05</dt>
+      <dt class="col-sm-3 text-center text-nowrap">2018-12-02</dt>
       <dd class="col-sm-9">
-        <a href="https://cloud.grammaticalframework.org/wordnet/">GF WordNet</a> now supports languages for which there are no other WordNets. New additions: Afrikaans, German, Korean, Maltese, Polish, Somali, Swahili.
+        <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">2021-03-01</dt>
+      <dt class="col-sm-3 text-center text-nowrap">2018-07-25</dt>
       <dd class="col-sm-9">
-        <a href="//school.grammaticalframework.org/2020/">Seventh GF Summer School</a>, in Singapore and online, 26 July &ndash; 6 August 2021.
+        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">2020-09-29</dt>
+      <dt class="col-sm-3 text-center text-nowrap">2017-08-11</dt>
       <dd class="col-sm-9">
-        <a href="https://www.mitpressjournals.org/doi/pdf/10.1162/COLI_a_00378">Abstract Syntax as Interlingua</a>: Scaling Up the Grammatical Framework from Controlled Languages to Robust Pipelines. A paper in Computational Linguistics (2020) summarizing much of the development in GF in the past ten years.
+        <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="//school.grammaticalframework.org/2017/">GF Summer School</a> in Riga (Latvia), 14-25 August 2017
       </dd>
     </dl>
 
@@ -341,16 +319,14 @@ least one, it may help you to get a first idea of what GF is.
     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> (RGL) has
+    <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),
-    Basque (partial),
     Bulgarian,
     Catalan,
     Chinese,
-    Czech (partial),
     Danish,
     Dutch,
     English,
@@ -362,12 +338,10 @@ least one, it may help you to get a first idea of what GF is.
     Greek modern,
     Hebrew (fragments),
     Hindi,
-    Hungarian (partial),
     Interlingua,
-    Italian,
     Japanese,
-    Korean (partial),
-    Latin (partial),
+    Italian,
+    Latin (fragments),
     Latvian,
     Maltese,
     Mongolian,
@@ -380,9 +354,7 @@ least one, it may help you to get a first idea of what GF is.
     Romanian,
     Russian,
     Sindhi,
-    Slovak (partial),
     Slovene (partial),
-    Somali (partial),
     Spanish,
     Swahili (fragments),
     Swedish,

src/compiler/Data/Binary/Builder.hs

@@ -68,22 +68,16 @@ import qualified Data.ByteString.Lazy as L
 import Data.ByteString.Base (inlinePerformIO)
 import qualified Data.ByteString.Base as S
 #else
-import Data.ByteString.Internal (accursedUnutterablePerformIO)
+import Data.ByteString.Internal (inlinePerformIO)
 import qualified Data.ByteString.Internal as S
 --import qualified Data.ByteString.Lazy.Internal as L
 #endif
 
 #if defined(__GLASGOW_HASKELL__) && !defined(__HADDOCK__)
-import GHC.Base(Int(..),uncheckedShiftRL#,)
+import GHC.Base(Int(..),uncheckedShiftRL# )
 import GHC.Word (Word32(..),Word16(..),Word64(..))
 
-#if MIN_VERSION_base(4,16,0)
-import GHC.Exts (wordToWord16#, word16ToWord#, wordToWord32#, word32ToWord#)
-#endif
-#if WORD_SIZE_IN_BITS < 64 && __GLASGOW_HASKELL__ >= 608 
-import GHC.Word (uncheckedShiftRL64#)
-#endif
-#if __GLASGOW_HASKELL__ >= 900 
+#if WORD_SIZE_IN_BITS < 64 && __GLASGOW_HASKELL__ >= 608
 import GHC.Word (uncheckedShiftRL64#)
 #endif
 #endif
@@ -205,7 +199,7 @@ defaultSize = 32 * k - overhead
 
 -- | Sequence an IO operation on the buffer
 unsafeLiftIO :: (Buffer -> IO Buffer) -> Builder
-unsafeLiftIO f =  Builder $ \ k buf -> accursedUnutterablePerformIO $ do
+unsafeLiftIO f =  Builder $ \ k buf -> inlinePerformIO $ do
     buf' <- f buf
     return (k buf')
 {-# INLINE unsafeLiftIO #-}
@@ -417,14 +411,8 @@ shiftr_w32 :: Word32 -> Int -> Word32
 shiftr_w64 :: Word64 -> Int -> Word64
 
 #if defined(__GLASGOW_HASKELL__) && !defined(__HADDOCK__)
-#if MIN_VERSION_base(4,16,0)
-shiftr_w16 (W16# w) (I# i) = W16# (wordToWord16# ((word16ToWord# w) `uncheckedShiftRL#`   i))
-shiftr_w32 (W32# w) (I# i) = W32# (wordToWord32# ((word32ToWord# w) `uncheckedShiftRL#`   i))
-#else
 shiftr_w16 (W16# w) (I# i) = W16# (w `uncheckedShiftRL#`   i)
 shiftr_w32 (W32# w) (I# i) = W32# (w `uncheckedShiftRL#`   i)
-#endif
-
 
 #if WORD_SIZE_IN_BITS < 64
 shiftr_w64 (W64# w) (I# i) = W64# (w `uncheckedShiftRL64#` i)
@@ -436,11 +424,7 @@ foreign import ccall unsafe "stg_uncheckedShiftRL64"
 #endif
 
 #else
-#if __GLASGOW_HASKELL__ <= 810
 shiftr_w64 (W64# w) (I# i) = W64# (w `uncheckedShiftRL#` i)
-#else
-shiftr_w64 (W64# w) (I# i) = W64# (w `uncheckedShiftRL64#` i)
-#endif
 #endif
 
 #else

src/compiler/Data/Binary/Get.hs

@@ -1,6 +1,4 @@
 {-# LANGUAGE CPP, MagicHash #-}
--- This module makes profiling a lot slower, so don't add automatic cost centres 
-{-# OPTIONS_GHC -fno-prof-auto #-}
 -- for unboxed shifts
 
 -----------------------------------------------------------------------------
@@ -101,17 +99,7 @@ import Data.STRef
 import GHC.Base
 import GHC.Word
 --import GHC.Int
-#if MIN_VERSION_base(4,16,0)
-import GHC.Exts (wordToWord16#, word16ToWord#, wordToWord32#, word32ToWord#)
 #endif
-#if __GLASGOW_HASKELL__ >= 900 
-import GHC.Word (uncheckedShiftL64#)
-#endif
-#endif
-
--- Control.Monad.Fail import will become redundant in GHC 8.8+
-import qualified Control.Monad.Fail as Fail
-
 
 -- | The parse state
 data S = S {-# UNPACK #-} !B.ByteString  -- current chunk
@@ -138,11 +126,6 @@ instance Monad Get where
                              (a, s') -> unGet (k a) s')
     {-# INLINE (>>=) #-}
 
-#if !(MIN_VERSION_base(4,13,0))
-    fail      = failDesc
-#endif
-
-instance Fail.MonadFail Get where
     fail      = failDesc
 
 instance MonadFix Get where
@@ -431,7 +414,7 @@ readN n f = fmap f $ getBytes n
 getPtr :: Storable a => Int -> Get a
 getPtr n = do
     (fp,o,_) <- readN n B.toForeignPtr
-    return . B.accursedUnutterablePerformIO $ withForeignPtr fp $ \p -> peek (castPtr $ p `plusPtr` o)
+    return . B.inlinePerformIO $ withForeignPtr fp $ \p -> peek (castPtr $ p `plusPtr` o)
 {- INLINE getPtr -}
 
 ------------------------------------------------------------------------
@@ -538,13 +521,8 @@ shiftl_w32 :: Word32 -> Int -> Word32
 shiftl_w64 :: Word64 -> Int -> Word64
 
 #if defined(__GLASGOW_HASKELL__) && !defined(__HADDOCK__)
-#if MIN_VERSION_base(4,16,0)
-shiftl_w16 (W16# w) (I# i) = W16# (wordToWord16# ((word16ToWord# w) `uncheckedShiftL#`   i))
-shiftl_w32 (W32# w) (I# i) = W32# (wordToWord32# ((word32ToWord# w) `uncheckedShiftL#`   i))
-#else
 shiftl_w16 (W16# w) (I# i) = W16# (w `uncheckedShiftL#`   i)
 shiftl_w32 (W32# w) (I# i) = W32# (w `uncheckedShiftL#`   i)
-#endif
 
 #if WORD_SIZE_IN_BITS < 64
 shiftl_w64 (W64# w) (I# i) = W64# (w `uncheckedShiftL64#` i)
@@ -556,12 +534,7 @@ foreign import ccall unsafe "stg_uncheckedShiftL64"
 #endif
 
 #else
-#if __GLASGOW_HASKELL__ <= 810
 shiftl_w64 (W64# w) (I# i) = W64# (w `uncheckedShiftL#` i)
-#else
-shiftl_w64 (W64# w) (I# i) = W64# (w `uncheckedShiftL64#` i)
-#endif
-
 #endif
 
 #else

src/compiler/GF.hs

@@ -0,0 +1,42 @@
+-- | GF, the Grammatical Framework, as a library
+module GF(
+           -- * Command line interface
+           module GF.Main,
+           module GF.Interactive,
+           module GF.Compiler,
+
+           -- * Compiling GF grammars
+           module GF.Compile,
+           module GF.CompileInParallel,
+--         module PF.Compile.Export, -- haddock does the wrong thing with this
+           exportPGF,
+           module GF.CompileOne,
+
+           -- * Abstract syntax, parsing, pretty printing and serialisation
+           module GF.Compile.GetGrammar,
+           module GF.Grammar.Grammar,
+           module GF.Grammar.Macros,
+           module GF.Grammar.Printer,
+           module GF.Infra.Ident,
+           -- ** Binary serialisation
+           module GF.Grammar.Binary,
+           -- * Canonical GF
+           module GF.Compile.GrammarToCanonical
+  ) where
+import GF.Main
+import GF.Compiler
+import GF.Interactive
+
+import GF.Compile
+import GF.CompileInParallel
+import GF.CompileOne
+import GF.Compile.Export(exportPGF)
+
+import GF.Compile.GetGrammar
+import GF.Grammar.Grammar
+import GF.Grammar.Macros
+import GF.Grammar.Printer
+import GF.Infra.Ident
+import GF.Grammar.Binary
+
+import GF.Compile.GrammarToCanonical

src/compiler/GF/Command/Abstract.hs

@@ -1,6 +1,6 @@
-module GF.Command.Abstract(module GF.Command.Abstract,Expr,showExpr,Literal(..),Term) where
+module GF.Command.Abstract(module GF.Command.Abstract,Expr,showExpr,Term) where
 
-import PGF2
+import PGF2(Expr,showExpr)
 import GF.Grammar.Grammar(Term)
 
 type Ident = String
@@ -13,22 +13,15 @@ data Command
    = Command Ident [Option] Argument
    deriving Show
 
-data TransactionCommand
-   = CreateFun [Option] Fun Type
-   | CreateCat [Option] Cat [Hypo]
-   | CreateConcrete [Option] ConcName
-   | CreateLin [Option] Fun (Maybe Term) Bool
-   | CreateLincat [Option] Cat (Maybe Term)
-   | DropFun [Option] Fun
-   | DropCat [Option] Cat
-   | DropConcrete [Option] ConcName
-   | DropLin [Option] Fun
-   | DropLincat [Option] Cat
-   deriving Show
-
 data Option
   = OOpt Ident
-  | OFlag Ident Literal
+  | OFlag Ident Value
+  deriving (Eq,Ord,Show)
+
+data Value
+  = VId  Ident
+  | VInt Int
+  | VStr String
   deriving (Eq,Ord,Show)
 
 data Argument
@@ -40,19 +33,9 @@ data Argument
 
 valIntOpts :: String -> Int -> [Option] -> Int
 valIntOpts flag def opts =
-  case [v | OFlag f (LInt v) <- opts, f == flag] of
-    (v:_) -> fromIntegral v
-    _     -> def
-
-valFltOpts :: String -> Double -> [Option] -> Double
-valFltOpts flag def opts =
-  case [v | OFlag f v <- opts, v <- toFlt v, f == flag] of
+  case [v | OFlag f (VInt v) <- opts, f == flag] of
     (v:_) -> v
     _     -> def
-  where
-    toFlt (LInt v) = [fromIntegral v]
-    toFlt (LFlt f) = [f]
-    toFlt _        = []
 
 valStrOpts :: String -> String -> [Option] -> String
 valStrOpts flag def opts =
@@ -62,8 +45,8 @@ valStrOpts flag def opts =
 
 maybeIntOpts :: String -> a -> (Int -> a) -> [Option] -> a
 maybeIntOpts flag def fn opts =
-  case [v | OFlag f (LInt v) <- opts, f == flag] of
-    (v:_) -> fn (fromIntegral v)
+  case [v | OFlag f (VInt v) <- opts, f == flag] of
+    (v:_) -> fn v
     _     -> def
 
 maybeStrOpts :: String -> a -> (String -> a) -> [Option] -> a
@@ -76,9 +59,9 @@ listFlags flag opts = [v | OFlag f v <- opts, f == flag]
 
 valueString v =
   case v of
-    LInt v -> show v
-    LFlt v -> show v
-    LStr v -> v
+    VStr v -> v
+    VId  v -> v
+    VInt v -> show v
 
 isOpt :: String -> [Option] -> Bool
 isOpt o opts = elem (OOpt o) opts

src/compiler/GF/Command/CommandInfo.hs

@@ -1,8 +1,8 @@
 module GF.Command.CommandInfo where
 import GF.Command.Abstract(Option,Expr,Term)
 import GF.Text.Pretty(render)
-import GF.Grammar.Grammar(Term(K))
 import GF.Grammar.Printer() -- instance Pretty Term
+import GF.Grammar.Macros(string2term)
 import PGF2(mkStr,unStr,showExpr)
 
 data CommandInfo m = CommandInfo {
@@ -73,8 +73,8 @@ toExprs args =
 toTerm args =
   case args of
     Term t -> t
-    Strings ss -> K $ unwords ss -- hmm
-    Exprs es -> K $ unwords $ map (showExpr [] . fst) es -- hmm
+    Strings ss -> string2term $ unwords ss -- hmm
+    Exprs es -> string2term $ unwords $ map (showExpr [] . fst) es -- hmm
 
 -- ** Creating documentation
 

src/compiler/GF/Command/Commands.hs

@@ -1,12 +1,12 @@
-{-# LANGUAGE FlexibleInstances, UndecidableInstances, CPP #-}
+{-# LANGUAGE FlexibleInstances, UndecidableInstances #-}
 module GF.Command.Commands (
   HasPGF(..),pgfCommands,
   options,flags,
   ) where
-import Prelude hiding (putStrLn,(<>)) -- GHC 8.4.1 clash with Text.PrettyPrint
-import System.Info(os)
+import Prelude hiding (putStrLn)
 
 import PGF2
+import PGF2.Internal(writePGF)
 
 import GF.Compile.Export
 import GF.Compile.ToAPI
@@ -31,11 +31,10 @@ import qualified Data.Map as Map
 import GF.Text.Pretty
 import Data.List (sort)
 import Control.Monad(mplus)
-import qualified Control.Monad.Fail as Fail
 
 class (Functor m,Monad m,MonadSIO m) => HasPGF m where getPGF :: m (Maybe PGF)
 
-instance (Monad m,HasPGF m,Fail.MonadFail m) => TypeCheckArg m where
+instance (Monad m,HasPGF m) => TypeCheckArg m where
   typeCheckArg e = do mb_pgf <- getPGF
                       case mb_pgf of
                         Just pgf -> either fail
@@ -43,7 +42,7 @@ instance (Monad m,HasPGF m,Fail.MonadFail m) => TypeCheckArg m where
                                            (inferExpr pgf e)
                         Nothing  -> fail "Import a grammar before using this command"
 
-pgfCommands :: (HasPGF m, Fail.MonadFail m) => Map.Map String (CommandInfo m)
+pgfCommands :: HasPGF m => Map.Map String (CommandInfo m)
 pgfCommands = Map.fromList [
   ("aw", emptyCommandInfo {
      longname = "align_words",
@@ -164,32 +163,29 @@ pgfCommands = Map.fromList [
        mkEx "gr                     -- one tree in the startcat of the current grammar",
        mkEx "gr -cat=NP -number=16  -- 16 trees in the category NP",
        mkEx "gr -lang=LangHin,LangTha -cat=Cl  -- Cl, both in LangHin and LangTha",
-       mkEx "gr (AdjCN ? (UseN ?))  -- fills in the metavariables in the expression"
+       mkEx "gr -probs=FILE         -- generate with bias",
+       mkEx "gr (AdjCN ? (UseN ?))  -- generate trees of form (AdjCN ? (UseN ?))"
        ],
      explanation = unlines [
        "Generates a list of random trees, by default one tree.",
-       "If a tree argument is given, the command fills in",
-       "the metavariables in the tree with values. The generation is",
-       "biased by probabilities if the grammar was compiled with",
-       "option -probs."
+       "If a tree argument is given, the command completes the Tree with values to",
+       "all metavariables in the tree. The generation can be biased by probabilities",
+       "if the grammar was compiled with option -probs"
        ],
      options = [
        ("show_probs", "show the probability of each result")
        ],
      flags = [
        ("cat","generation category"),
-       ("depth","the maximum generation depth, default 4"),
        ("lang","uses only functions that have linearizations in all these languages"),
        ("number","number of trees generated")
        ],
      exec = needPGF $ \opts arg pgf -> do
        gen <- newStdGen
-       let dp = valIntOpts "depth" 4 opts
-           langs = optLangs pgf opts
-           es = case mexp (toExprs arg) of
-                   Just ex -> generateRandomFromExt gen pgf ex dp langs
-                   Nothing -> generateRandomExt     gen pgf (optType pgf opts) dp langs
-       returnFromExprs (isOpt "show_probs" opts) $ take (optNum opts) es
+       let ts  = case mexp (toExprs arg) of
+                   Just ex -> generateRandomFrom gen pgf ex
+                   Nothing -> generateRandom     gen pgf (optType pgf opts)
+       returnFromExprs (isOpt "show_probs" opts) $ take (optNum opts) ts
      }),
 
   ("gt", emptyCommandInfo {
@@ -197,32 +193,26 @@ pgfCommands = Map.fromList [
      synopsis = "generates a list of trees, by default exhaustive",
      explanation = unlines [
        "Generates all trees of a given category.",
-       "If a tree argument is given, the command completes",
-       "the metavariables in the tree with values.",
-       "The generated trees are listed in decreasing probability order",
-       "(increasing negated log-probability)."
+       "If a Tree argument is given, the command completes the Tree with values",
+       "to all metavariables in the tree."
        ],
      options = [
        ("show_probs", "show the probability of each result")
        ],
      flags = [
        ("cat","the generation category"),
-       ("depth","the maximum generation depth, default 4"),
-       ("lang","uses only functions that have linearizations in all these languages"),
+       ("lang","excludes functions that have no linearization in this language"),
        ("number","the number of trees generated")
        ],
      examples = [
-       mkEx "gt                     -- all trees in the startcat with maximal depth 4",
-       mkEx "gt -cat=NP -number=16  -- 16 trees in the category NP with maximal depth 4",
-       mkEx "gt -cat=NP -depth=2    -- all trees in the category NP with up to depth 2",
+       mkEx "gt                     -- all trees in the startcat",
+       mkEx "gt -cat=NP -number=16  -- 16 trees in the category NP",
        mkEx "gt (AdjCN ? (UseN ?))  -- trees of form (AdjCN ? (UseN ?))"
        ],
      exec = needPGF $ \opts arg pgf -> do
-       let dp = valIntOpts "depth" 4 opts
-           langs = optLangs pgf opts
-           es = case mexp (toExprs arg) of
-                  Just ex -> generateAllFromExt pgf ex dp langs
-                  Nothing -> generateAllExt     pgf (optType pgf opts) dp langs
+       let es = case mexp (toExprs arg) of
+                  Just ex -> generateAllFrom pgf ex
+                  Nothing -> generateAll     pgf (optType pgf opts)
        returnFromExprs (isOpt "show_probs" opts) $ takeOptNum opts es
      }),
 
@@ -247,7 +237,6 @@ pgfCommands = Map.fromList [
        ],
      options = [
        ("retain","retain operations (used for cc command)"),
-       ("resource","the grammar is loaded as a resource to a precompiled PGF"),
        ("src",   "force compilation from source"),
        ("v",     "be verbose - show intermediate status information")
        ],
@@ -285,49 +274,31 @@ pgfCommands = Map.fromList [
 
   ("ma", emptyCommandInfo {
      longname = "morpho_analyse",
-     synopsis = "print the morphological analyses of words in the string",
+     synopsis = "print the morphological analyses of all words in the string",
      explanation = unlines [
-       "Prints all the analyses of words in the input string.",
-       "By default it assumes that the input consists of a single lexical expression,",
-       "but if one of the options bellow is used then the command tries to",
-       "separate the text into units. Some of the units may be multi-word expressions,",
-       "others punctuations, or morphemes not separated by spaces."
+       "Prints all the analyses of space-separated words in the input string,",
+       "using the morphological analyser of the actual grammar (see command pg)"
        ],
      exec  = needPGF $ \opts ts pgf -> do
                concr <- optLang pgf opts
                case opts of
-                 _ | isOpt "all" opts ->
-                      return . fromString . unlines .
-                      map prCohortAnalysis . concatMap (morphoCohorts id concr) $
-                      toStrings ts
-                 _ | isOpt "longest" opts ->
-                      return . fromString . unlines .
-                      map prCohortAnalysis . concatMap (morphoCohorts filterLongest concr) $
-                      toStrings ts
-                 _ | isOpt "best" opts ->
-                      return . fromString . unlines .
-                      map prCohortAnalysis . concatMap (morphoCohorts filterBest concr) $
-                      toStrings ts
-                 _ | isOpt "known" opts ->
-                      return . fromString . unwords .
-                      concatMap (morphoKnown concr) $
-                      toStrings ts
                  _ | isOpt "missing" opts ->
                       return . fromString . unwords .
-                      concatMap (morphoMissing concr) $
-                      toStrings ts
+                      morphoMissing concr .
+                      concatMap words $ toStrings ts
+                 _ | isOpt "known" opts ->
+                      return . fromString . unwords .
+                      morphoKnown concr .
+                      concatMap words $ toStrings ts
                  _ -> return . fromString . unlines .
-                      map prMorphoAnalysis . concatMap (morphos pgf opts) $
-                      toStrings ts,
+                      map prMorphoAnalysis . concatMap (morphos pgf opts) .
+                      concatMap words $ toStrings ts,
      flags = [
        ("lang","the languages of analysis (comma-separated, no spaces)")
        ],
      options = [
-       ("all",    "scan the text for all words, not just a single one"),
-       ("longest","scan the text for all words, and apply longest match filtering"),
-       ("best",   "scan the text for all words, and apply global best match filtering"),
-       ("known",  "list all known words, in order of appearance"),
-       ("missing","list all missing words, in order of appearance")
+       ("known",  "return only the known words, in order of appearance"),
+       ("missing","show the list of unknown words, in order of appearance")
        ]
      }),
 
@@ -396,7 +367,7 @@ pgfCommands = Map.fromList [
      exec  = needPGF $ \opts _ pgf -> prGrammar pgf opts,
      flags = [
        ("file",   "set the file name when printing with -pgf option"),
-       ("lang",   "select languages for some options (default all languages)"),
+       ("lang",   "select languages for the some options (default all languages)"),
        ("printer","select the printing format (see flag values above)")
        ],
      options = [
@@ -407,7 +378,7 @@ pgfCommands = Map.fromList [
        ("lexc", "print the lexicon in Xerox LEXC format"),
        ("missing","show just the names of functions that have no linearization"),
        ("opt",    "optimize the generated pgf"),
-       ("pgf",    "write the current pgf image in a file"),
+       ("pgf",    "write current pgf image in file"),
        ("words", "print the list of words")
        ],
      examples = [
@@ -588,8 +559,12 @@ pgfCommands = Map.fromList [
                                           nodeEdgeStyle = valStrOpts "nodeedgestyle" "solid" opts,
                                           leafEdgeStyle = valStrOpts "leafedgestyle" "dashed" opts
                                          }
+         let depfile = valStrOpts "file" "" opts
          concr  <- optLang pgf opts
-         let grphs = map (graphvizParseTree concr gvOptions) es
+         mlab <- case depfile of
+           "" -> return Nothing
+           _  -> (Just . getDepLabels) `fmap` restricted (readFile depfile)
+         let grphs = map (graphvizDependencyTree "dot" False mlab Nothing concr) es
          if isFlag "view" opts || isFlag "format" opts
            then do
              let view = optViewGraph opts
@@ -646,8 +621,8 @@ pgfCommands = Map.fromList [
          mapM_ putStrLn ss
          return void
        else do
-         let funs = isOpt "nofun" opts
-         let cats = isOpt "nocat" opts
+         let funs = not (isOpt "nofun" opts)
+         let cats = not (isOpt "nocat" opts)
          let grphs = map (graphvizAbstractTree pgf (graphvizDefaults{noFun=funs,noCat=cats})) es
          if isFlag "view" opts || isFlag "format" opts
            then do
@@ -676,19 +651,19 @@ pgfCommands = Map.fromList [
      syntax = "ai IDENTIFIER  or  ai EXPR",
      synopsis = "Provides an information about a function, an expression or a category from the abstract syntax",
      explanation = unlines [
-       "The command has one argument which is either a function, an expression or",
-       "a category defined in the abstract syntax of the current grammar.",
-       "If the argument is a function then its type is printed out.",
+       "The command has one argument which is either function, expression or",
+       "a category defined in the abstract syntax of the current grammar. ",
+       "If the argument is a function then ?its type is printed out.",
        "If it is a category then the category definition is printed.",
-       "If a whole expression is given, then it prints the expression with refined",
-       "metavariables as well as the type of the expression."
+       "If a whole expression is given it prints the expression with refined",
+       "metavariables and the type of the expression."
        ],
      exec = needPGF $ \opts arg pgf -> do
        case toExprs arg of
          [e] -> case unApp e of
                   Just (id, []) -> case functionType pgf id of
                                      Just ty -> do putStrLn (showFun pgf id ty)
-                                                   putStrLn ("Probability: "++show (exprProbability pgf e))
+                                                   putStrLn ("Probability: "++show (treeProbability pgf e))
                                                    return void
                                      Nothing -> case categoryContext pgf id of
                                                   Just hypos -> do putStrLn ("cat "++id++if null hypos then "" else ' ':showContext [] hypos)
@@ -701,79 +676,21 @@ pgfCommands = Map.fromList [
                                                   Nothing    -> do putStrLn ("unknown category of function identifier "++show id)
                                                                    return void
                   _             -> case inferExpr pgf e of
-                                     Left err     -> errorWithoutStackTrace err
+                                     Left err     -> error err
                                      Right (e,ty) -> do putStrLn ("Expression:  "++showExpr [] e)
                                                         putStrLn ("Type:        "++showType [] ty)
-                                                        putStrLn ("Probability: "++show (exprProbability pgf e))
+                                                        putStrLn ("Probability: "++show (treeProbability pgf e))
                                                         return void
          _           -> do putStrLn "a single identifier or expression is expected from the command"
                            return void,
      needsTypeCheck = False
-     }),
-  ("c", emptyCommandInfo {
-     longname = "create",
-     syntax = "create fun f = ..; create cat c = ..; create concrete l; create lin c = ..; or create lincat c = ..",
-     synopsis = "Dynamically adds new functions, categories and languages to the current grammar.",
-     explanation = unlines [
-       "After the command you can write fun, data, cat, concrete, lin or a lincat definition.",
-       "The syntax is the same as if the definition was in a module. If you want to use",
-       "any operations inside lin and lincat, you should import them",
-       "by using the command `i -resource <file path>`."
-       ],
-     flags = [
-       ("lang","the language to which to add a lin or a lincat"),
-       ("prob","the probability for a new abstract function")
-       ],
-     needsTypeCheck = False
-     }),
-  ("a", emptyCommandInfo {
-     longname = "alter",
-     syntax = "alter lin f = ..",
-     synopsis = "Dynamically updates the linearization of a function in the current grammar.",
-     explanation = unlines [
-       "The syntax is the same as if the definition was in a module. If you want to use",
-       "any operations inside the lin definition, you should import them",
-       "by using the command `i -resource <file path>`."
-       ],
-     flags = [
-       ("lang","the language in which to alter the lin")
-       ],
-     needsTypeCheck = False
-     }),
-  ("d", emptyCommandInfo {
-     longname = "drop",
-     syntax = "drop fun f; drop cat c; drop concrete l; drop lin c; or drop lincat c",
-     synopsis = "Dynamically removes functions, categories and languages from the current grammar.",
-     explanation = unlines [
-       "After the command you must specify whether you want to remove",
-       "fun, data, cat, concrete, lin or a lincat definition.",
-       "Note that if you are removing an abstract function or category,",
-       "then all corresponding linearizations will be dropped as well."
-       ],
-     flags = [
-       ("lang","the language from which to remove the lin or the lincat")
-       ],
-     needsTypeCheck = False
-     }),
-  ("t", emptyCommandInfo {
-     longname = "transaction",
-     syntax = "transaction (start|commit|rollback)",
-     synopsis = "Starts, commits or rollbacks a transaction",
-     explanation = unlines [
-       "If there is no active transaction, each create and drop command",
-       "starts its own transaction. Start it manually",
-       "if you want to perform several operations in one transaction.",
-       "This also makes batch operations a lot faster."
-       ],
-     flags = [],
-     needsTypeCheck = False
      })
   ]
  where
    needPGF exec opts ts = do
      mb_pgf <- getPGF
      case mb_pgf of
-       Just pgf -> do liftSIO $ exec opts ts pgf
+       Just pgf -> liftSIO $ exec opts ts pgf
        _ -> fail "Import a grammar before using this command"
 
    joinPiped (Piped (es1,ms1)) (Piped (es2,ms2)) = Piped (jA es1 es2,ms1+++-ms2)
@@ -791,24 +708,26 @@ pgfCommands = Map.fromList [
    optLins pgf opts ts = concatMap (optLin pgf opts) ts
    optLin pgf opts t =
      case opts of
+       _ | isOpt "treebank" opts && isOpt "chunks" opts ->
+         (abstractName pgf ++ ": " ++ showExpr [] t) :
+         [lang ++ ": " ++ li | (lang,li) <- linChunks pgf opts t] --linear pgf opts lang t | lang <- optLangs pgf opts]
        _ | isOpt "treebank" opts ->
          (abstractName pgf ++ ": " ++ showExpr [] t) :
          [concreteName concr ++ ": " ++ s | concr <- optLangs pgf opts, s<-linear opts concr t]
+       _ | isOpt "chunks" opts -> map snd $ linChunks pgf opts t   
        _ -> [s | concr <- optLangs pgf opts, s <- linear opts concr t]
+   linChunks pgf opts t = 
+     [(concreteName concr, unwords (intersperse "<+>" (map (unlines . linear opts concr) (treeChunks t)))) | concr <- optLangs pgf opts]
 
    linear :: [Option] -> Concr -> Expr -> [String]
    linear opts concr = case opts of
-       _ | isOpt "list"    opts &&
-           isOpt "all"     opts -> map (commaList . map snd) . tabularLinearizeAll concr
-       _ | isOpt "list"    opts -> (:[]) . commaList .
-                                   map snd . tabularLinearize concr
-       _ | isOpt "table"   opts &&
-           isOpt "all"     opts -> map (\(p,v) -> p+++":"+++v) . concat . tabularLinearizeAll concr
-       _ | isOpt "table"   opts -> map (\(p,v) -> p+++":"+++v) . tabularLinearize concr
-       _ | isOpt "bracket" opts &&
-           isOpt "all"     opts -> map (unwords . map showBracketedString) . bracketedLinearizeAll concr
+       _ | isOpt "all"     opts -> concat .
+                                   map (map snd) . tabularLinearizeAll concr
+       _ | isOpt "list"    opts -> (:[]) . commaList . concat .
+                                   map (map snd) . tabularLinearizeAll concr
+       _ | isOpt "table"   opts -> concat .
+                                    map (map (\(p,v) -> p+++":"+++v)) . tabularLinearizeAll concr
        _ | isOpt "bracket" opts -> (:[]) . unwords . map showBracketedString . bracketedLinearize concr
-       _ | isOpt "all"     opts -> linearizeAll concr
        _                        -> (:[]) . linearize concr
 
    -- replace each non-atomic constructor with mkC, where C is the val cat
@@ -834,9 +753,8 @@ pgfCommands = Map.fromList [
 
    optLangsFlag flag pgf opts =
      case valStrOpts flag "" opts of
-       "no" -> []
-       ""   -> Map.elems langs
-       str  -> mapMaybe (completeLang pgf) (chunks ',' str)
+       ""  -> Map.elems langs
+       str -> mapMaybe (completeLang pgf) (chunks ',' str)
      where
        langs = languages pgf
 
@@ -854,15 +772,11 @@ pgfCommands = Map.fromList [
                          Nothing -> error ("Can't parse '"++str++"' as a type")
      in maybeStrOpts "cat" (startCat pgf) readOpt opts
    optViewFormat opts = valStrOpts "format" "png" opts
-   optViewGraph opts = valStrOpts "view" open_cmd opts
+   optViewGraph opts = valStrOpts "view" "open" opts
    optNum opts = valIntOpts "number" 1 opts
    optNumInf opts = valIntOpts "number" 1000000000 opts ---- 10^9
    takeOptNum opts = take (optNumInf opts)
 
-   open_cmd | os == "linux"   = "xdg-open"
-            | os == "mingw32" = "start"
-            | otherwise       = "open"
-
    returnFromExprs show_p es =
      return $ 
        case es of
@@ -872,7 +786,7 @@ pgfCommands = Map.fromList [
    prGrammar pgf opts
      | isOpt "pgf"      opts = do
           let outfile = valStrOpts "file" (abstractName pgf ++ ".pgf") opts
-          restricted $ writePGF outfile pgf (Just (map concreteName (optLangs pgf opts)))
+          restricted $ writePGF outfile pgf
           putStrLn $ "wrote file " ++ outfile
           return void
      | isOpt "cats"     opts = return $ fromString $ unwords $ categories pgf
@@ -889,23 +803,12 @@ pgfCommands = Map.fromList [
 
    showFun pgf id ty = kwd++" "++ id ++ " : " ++ showType [] ty
                        where
-                         kwd | functionIsConstructor pgf id = "data"
-                             | otherwise                    = "fun"
+                         kwd | functionIsDataCon pgf id = "data"
+                             | otherwise                = "fun"
 
    morphos pgf opts s =
      [(s,lookupMorpho concr s) | concr <- optLangs pgf opts]
 
-   morphoCohorts f concr s = f (lookupCohorts concr s)
-
-   morphoKnown = morphoClassify True
-
-   morphoMissing = morphoClassify False
-
-   morphoClassify k concr s =
-     [w | (_,w,ans,_) <- lookupCohorts concr s, k /= null ans, notLiteral w]
-     where
-       notLiteral w = not (all isDigit w)
-
    optClitics opts = case valStrOpts "clitics" "" opts of
      "" -> []
      cs -> map reverse $ chunks ',' cs
@@ -916,9 +819,19 @@ pgfCommands = Map.fromList [
 
    -- ps -f -g s returns g (f s)
    treeOps pgf opts s = foldr app s (reverse opts) where
-     app (OOpt  op)          | Just (Left  f) <- treeOp pgf op = f
-     app (OFlag op (LStr x)) | Just (Right f) <- treeOp pgf op = f x
-     app _                                                     = id
+     app (OOpt  op)         | Just (Left  f) <- treeOp pgf op = f
+     app (OFlag op (VId x)) | Just (Right f) <- treeOp pgf op = f x
+     app _                                                    = id
+
+morphoMissing  :: Concr -> [String] -> [String]
+morphoMissing = morphoClassify False
+
+morphoKnown    :: Concr -> [String] -> [String]
+morphoKnown = morphoClassify True
+
+morphoClassify :: Bool -> Concr -> [String] -> [String]
+morphoClassify k concr ws = [w | w <- ws, k /= null (lookupMorpho concr w), notLiteral w] where
+  notLiteral w = not (all isDigit w)
 
 treeOpOptions pgf = [(op,expl) | (op,(expl,Left  _)) <- allTreeOps pgf]
 treeOpFlags   pgf = [(op,expl) | (op,(expl,Right _)) <- allTreeOps pgf]
@@ -958,10 +871,7 @@ prAllWords concr =
   unwords [w | (w,_) <- fullFormLexicon concr]
 
 prMorphoAnalysis (w,lps) =
-  unlines (w:[l ++ " : " ++ p ++ " " ++ show prob | (l,p,prob) <- lps])
-
-prCohortAnalysis (i,w,lps,j) =
-  unlines ((show i++"-"++show j++" "++w):[l ++ " : " ++ p ++ " " ++ show prob | (l,p,prob) <- lps])
+  unlines (w:[l ++ " : " ++ p ++ show prob | (l,p,prob) <- lps])
 
 viewGraphviz :: String -> String -> String -> [String] -> SIO CommandOutput
 viewGraphviz view format name grphs = do
@@ -1006,7 +916,3 @@ stanzas = map unlines . chop . lines where
   chop ls = case break (=="") ls of
     (ls1,[])  -> [ls1]
     (ls1,_:ls2) -> ls1 : chop ls2
-
-#if !(MIN_VERSION_base(4,9,0))
-errorWithoutStackTrace = error
-#endif

src/compiler/GF/Command/CommonCommands.hs

@@ -14,7 +14,6 @@ import GF.Command.Abstract --(isOpt,valStrOpts,prOpt)
 import GF.Text.Pretty
 import GF.Text.Transliterations
 import GF.Text.Lexing(stringOp,opInEnv)
-import Data.Char (isSpace)
 
 import PGF2(showExpr)
 
@@ -166,8 +165,7 @@ commonCommands = fmap (mapCommandExec liftSIO) $ Map.fromList [
        restrictedSystem $ syst ++ " <" ++ tmpi ++ " >" ++ tmpo
        fmap fromString $ restricted $ readFile tmpo,
        -}
-       fmap (fromStrings . lines) . restricted . readShellProcess syst . unlines . map (dropWhile (=='\n')) $ toStrings $ arg,
-
+       fmap fromString . restricted . readShellProcess syst $ toString arg,
      flags = [
        ("command","the system command applied to the argument")
        ],

src/compiler/GF/Command/Importing.hs

@@ -0,0 +1,64 @@
+module GF.Command.Importing (importGrammar, importSource) where
+
+import PGF2
+import PGF2.Internal(unionPGF)
+
+import GF.Compile
+import GF.Compile.Multi (readMulti)
+import GF.Compile.GetGrammar (getBNFCRules, getEBNFRules)
+import GF.Grammar (SourceGrammar) -- for cc command
+import GF.Grammar.BNFC
+import GF.Grammar.EBNF
+import GF.Grammar.CFG
+import GF.Compile.CFGtoPGF
+import GF.Infra.UseIO(die,tryIOE)
+import GF.Infra.Option
+import GF.Data.ErrM
+
+import System.FilePath
+import qualified Data.Set as Set
+import qualified Data.Map as Map
+import Control.Monad(foldM)
+
+-- import a grammar in an environment where it extends an existing grammar
+importGrammar :: Maybe PGF -> Options -> [FilePath] -> IO (Maybe PGF)
+importGrammar pgf0 _    []    = return pgf0
+importGrammar pgf0 opts files =
+  case takeExtensions (last files) of
+    ".cf"   -> fmap Just $ importCF opts files getBNFCRules bnfc2cf
+    ".ebnf" -> fmap Just $ importCF opts files getEBNFRules ebnf2cf
+    ".gfm"  -> do
+      ascss <- mapM readMulti files
+      let cs = concatMap snd ascss
+      importGrammar pgf0 opts cs
+    s | elem s [".gf",".gfo"] -> do
+      res <- tryIOE $ compileToPGF opts files
+      case res of
+        Ok pgf2 -> ioUnionPGF pgf0 pgf2
+        Bad msg -> do putStrLn ('\n':'\n':msg)
+                      return pgf0
+    ".pgf" -> do
+      mapM readPGF files >>= foldM ioUnionPGF pgf0
+    ext -> die $ "Unknown filename extension: " ++ show ext
+
+ioUnionPGF :: Maybe PGF -> PGF -> IO (Maybe PGF)
+ioUnionPGF Nothing    two = return (Just two)
+ioUnionPGF (Just one) two =
+  case unionPGF one two of
+    Nothing         -> putStrLn "Abstract changed, previous concretes discarded." >> return (Just two)
+    Just pgf        -> return (Just pgf)
+
+importSource :: Options -> [FilePath] -> IO SourceGrammar
+importSource opts files = fmap (snd.snd) (batchCompile opts files)
+
+-- for different cf formats
+importCF opts files get convert = impCF
+  where
+    impCF = do
+      rules <- fmap (convert . concat) $ mapM (get opts) files
+      startCat <- case rules of
+                    (Rule cat _ _ : _) -> return cat
+                    _                  -> fail "empty CFG"
+      probs <- maybe (return Map.empty) readProbabilitiesFromFile (flag optProbsFile opts)
+      let pgf = cf2pgf opts (last files) (mkCFG startCat Set.empty rules) probs
+      return pgf

src/compiler/GF/Command/Interpreter.hs

@@ -11,8 +11,6 @@ import PGF2
 
 import Control.Monad(when)
 import qualified Data.Map as Map
-import GF.Infra.UseIO (Output)
-import qualified Control.Monad.Fail as Fail
 
 data CommandEnv m = CommandEnv {
   commands      :: Map.Map String (CommandInfo m),
@@ -24,7 +22,6 @@ data CommandEnv m = CommandEnv {
 mkCommandEnv cmds = CommandEnv cmds Map.empty Map.empty
 
 --interpretCommandLine :: CommandEnv -> String -> SIO ()
-interpretCommandLine :: (Fail.MonadFail m, Output m, TypeCheckArg m) => CommandEnv m -> String -> m ()
 interpretCommandLine env line =
   case readCommandLine line of
     Just []    -> return ()

src/compiler/GF/Command/Parse.hs

@@ -0,0 +1,72 @@
+module GF.Command.Parse(readCommandLine, pCommand) where
+
+import PGF2(pExpr,pIdent)
+import GF.Grammar.Parser(runPartial,pTerm)
+import GF.Command.Abstract
+
+import Data.Char(isDigit,isSpace)
+import Control.Monad(liftM2)
+import Text.ParserCombinators.ReadP
+
+readCommandLine :: String -> Maybe CommandLine
+readCommandLine s =
+    case [x | (x,cs) <- readP_to_S pCommandLine s, all isSpace cs] of
+      [x] -> Just x
+      _   -> Nothing
+
+pCommandLine =
+  (skipSpaces >> char '-' >> char '-' >> pTheRest >> return [])   -- comment
+  <++
+  (sepBy (skipSpaces >> pPipe) (skipSpaces >> char ';'))
+
+pPipe = sepBy1 (skipSpaces >> pCommand) (skipSpaces >> char '|')
+
+pCommand = (do
+  cmd  <- readS_to_P pIdent <++ (char '%' >> fmap ('%':) (readS_to_P pIdent))
+  skipSpaces
+  opts <- sepBy pOption skipSpaces
+  arg  <- if getCommandOp cmd == "cc" then pArgTerm else pArgument
+  return (Command cmd opts arg)
+  )
+    <++ (do
+  char '?'
+  skipSpaces
+  c <- pSystemCommand
+  return (Command "sp" [OFlag "command" (VStr c)] ANoArg)
+  )
+
+pOption = do
+  char '-'
+  flg <- readS_to_P pIdent
+  option (OOpt flg) (fmap (OFlag flg) (char '=' >> pValue))
+
+pValue = do
+  fmap VInt (readS_to_P reads)
+  <++
+  fmap VStr (readS_to_P reads)
+  <++
+  fmap VId  pFilename
+
+pFilename = liftM2 (:) (satisfy isFileFirst) (munch (not . isSpace)) where
+  isFileFirst c = not (isSpace c) && not (isDigit c)
+
+pArgument =
+  option ANoArg
+    (fmap AExpr (readS_to_P pExpr)
+              <++
+    (skipSpaces >> char '%' >> fmap AMacro (readS_to_P pIdent)))
+
+pArgTerm = ATerm `fmap` readS_to_P sTerm
+  where
+    sTerm s = case runPartial pTerm s of
+                Right (s,t) -> [(t,s)]
+                _ -> []
+
+pSystemCommand =
+    (char '"' >> (manyTill (pEsc <++ get) (char '"')))
+      <++
+    pTheRest
+  where
+    pEsc = char '\\' >> get
+
+pTheRest = munch (const True)

src/compiler/GF/Command/SourceCommands.hs

@@ -1,6 +1,5 @@
 -- | Commands requiring source grammar in env
 module GF.Command.SourceCommands(HasGrammar(..),sourceCommands) where
-
 import Prelude hiding (putStrLn)
 import qualified Prelude as P(putStrLn)
 import Data.List(nub,isInfixOf,isPrefixOf)
@@ -8,19 +7,21 @@ import qualified Data.ByteString.UTF8 as UTF8(fromString)
 import qualified Data.Map as Map
 
 import GF.Infra.SIO(MonadSIO(..),restricted)
-import GF.Infra.Dependencies(depGraph)
-import GF.Infra.CheckM
-import GF.Text.Pretty(render,pp)
-import GF.Data.Str(sstr)
+import GF.Infra.Option(modifyFlags,optTrace) --,noOptions
 import GF.Data.Operations (chunks,err,raise)
+import GF.Text.Pretty(render)
+import GF.Data.Str(sstr)
 
 import GF.Grammar hiding (Ident,isPrefixOf)
 import GF.Grammar.Analyse
+import GF.Grammar.Parser (runP, pExp)
 import GF.Grammar.ShowTerm
 import GF.Grammar.Lookup (allOpers,allOpersTo)
 import GF.Compile.Rename(renameSourceTerm)
-import GF.Compile.Compute.Concrete2(normalForm,normalFlatForm,Globals(..),stdPredef)
-import GF.Compile.TypeCheck.Concrete as TC(inferLType)
+import qualified GF.Compile.Compute.ConcreteNew as CN(normalForm,resourceValues)
+import GF.Compile.TypeCheck.RConcrete as TC(inferLType,ppType)
+import GF.Infra.Dependencies(depGraph)
+import GF.Infra.CheckM(runCheck)
 
 import GF.Command.Abstract(Option(..),isOpt,listFlags,valueString,valStrOpts)
 import GF.Command.CommandInfo
@@ -37,8 +38,8 @@ sourceCommands = Map.fromList [
      explanation = unlines [
        "Compute TERM by concrete syntax definitions. Uses the topmost",
        "module (the last one imported) to resolve constant names.",
-       "N.B.1 You need the flag -retain or -resource when importing the grammar,",
-       "if you want the definitions to be available after compilation.",
+       "N.B.1 You need the flag -retain when importing the grammar, if you want",
+       "the definitions to be retained after compilation.",
        "N.B.2 The resulting term is not a tree in the sense of abstract syntax",
        "and hence not a valid input to a Tree-expecting command.",
        "This command must be a line of its own, and thus cannot be a part",
@@ -50,10 +51,10 @@ sourceCommands = Map.fromList [
        ("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"),
-       ("flat","expand all variants and show a flat list of terms")
+       ("trace","trace computations")
        ],
      needsTypeCheck = False, -- why not True?
-     exec = withTerm compute_concrete
+     exec = withStrings compute_concrete
      }),
   ("dg",  emptyCommandInfo {
      longname = "dependency_graph",
@@ -100,7 +101,7 @@ sourceCommands = Map.fromList [
        mkEx "sd -size ParadigmsEng.mkV    -- show all constants on which mkV depends, together with size"
        ],
      needsTypeCheck = False,
-     exec = withTerm show_deps
+     exec = withStrings show_deps
      }),
 
   ("so", emptyCommandInfo {
@@ -109,9 +110,8 @@ sourceCommands = Map.fromList [
      synopsis = "show all operations in scope, possibly restricted to a value type",
      explanation = unlines [
        "Show the names and type signatures of all operations available in the current resource.",
-       "If no grammar is loaded with 'import -retain' or 'import -resource',",
-       "then only the predefined operations are in scope.",
-       "The operations include also the parameter constructors that are in scope.",
+       "This command requires a source grammar to be in scope, imported with 'import -retain'.",
+       "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",
@@ -129,7 +129,7 @@ sourceCommands = Map.fromList [
          mkEx "so | wf -file=/tmp/opers -- write the list of opers to a file"
        ],
      needsTypeCheck = False,
-     exec = withTerm show_operations
+     exec = withStrings show_operations
      }),
 
   ("ss", emptyCommandInfo {
@@ -162,15 +162,15 @@ sourceCommands = Map.fromList [
       do sgr <- getGrammar
          liftSIO (exec opts (toStrings ts) sgr)
 
-    withTerm exec opts ts =
-      do sgr <- getGrammar
-         liftSIO (exec opts (toTerm ts) sgr)
-
-    compute_concrete opts t sgr = fmap fst $ runCheck $ do
-      ts <- checkComputeTerm opts sgr t
-      return (fromStrings (map (showTerm sgr style q) ts))
+    compute_concrete opts ws sgr =
+      case runP pExp (UTF8.fromString s) of
+        Left (_,msg) -> return $ pipeMessage msg
+        Right t      -> return $ err pipeMessage
+                                     (fromString . showTerm sgr style q)
+                                 $ checkComputeTerm opts sgr t
       where
         (style,q) = pOpts TermPrintDefault Qualified opts
+        s = unwords ws
 
         pOpts style q []     = (style,q)
         pOpts style q (o:os) =
@@ -184,8 +184,12 @@ sourceCommands = Map.fromList [
             OOpt "qual"    -> pOpts style            Qualified   os
             _              -> pOpts style            q           os
 
-    show_deps os t sgr = do
-          ops <- err error (return . nub) $ constantDepsTerm sgr t
+    show_deps os xs sgr = do
+          ops <- case xs of
+             _:_ -> do
+               let ts = [t | Right t <- map (runP pExp . UTF8.fromString) xs]
+               err error (return . nub . concat) $ mapM (constantDepsTerm sgr) ts
+             _   -> error "expected one or more qualified constants as argument"
           let prTerm = showTerm sgr TermPrintDefault Qualified
           let size = sizeConstant sgr
           let printed
@@ -196,15 +200,24 @@ sourceCommands = Map.fromList [
                 | otherwise = unwords $ map prTerm ops
           return $ fromString printed
 
-    show_operations os t sgr = fmap fst $ runCheck $ do
-      let greps = map valueString (listFlags "grep" os)
-      ops <- do tys <- checkComputeTerm os sgr t
-                return $ concatMap (allOpersTo sgr) tys
-      let sigs = [(op,ty) | ((mo,op),ty,pos) <- ops]
-          printer = showTerm sgr TermPrintDefault
-                             (if isOpt "raw" os then Qualified else Unqualified)
-          printed = [unwords [showIdent op, ":", printer ty] | (op,ty) <- sigs]
-      return . fromString $ unlines [l | l <- printed, all (`isInfixOf` l) greps]
+    show_operations os ts sgr =
+      case greatestResource sgr of
+        Nothing -> return $ fromString "no source grammar in scope; did you import with -retain?"
+        Just mo -> do
+          let greps = map valueString (listFlags "grep" os)
+          let isRaw = isOpt "raw" os
+          ops <- case ts of
+             _:_ -> do
+               let Right t = runP pExp (UTF8.fromString (unwords ts))
+               ty <- err error return $ checkComputeTerm os sgr t
+               return $ allOpersTo sgr ty
+             _   -> return $ allOpers sgr
+          let sigs = [(op,ty) | ((mo,op),ty,pos) <- ops]
+          let printer = if isRaw
+                          then showTerm sgr TermPrintDefault Qualified
+                          else (render . TC.ppType)
+          let printed = [unwords [showIdent op, ":", printer ty] | (op,ty) <- sigs]
+          return . fromString $ unlines [l | l <- printed, all (`isInfixOf` l) greps]
 
     show_source os ts sgr = do
       let strip = if isOpt "strip" os then stripSourceGrammar else id
@@ -241,20 +254,16 @@ sourceCommands = Map.fromList [
          return void
 
 checkComputeTerm os sgr t =
-  do mo <- case greatestResource sgr of
-             Nothing -> checkError (pp "No source grammar in scope")
-             Just mo -> return mo
-     t <- renameSourceTerm sgr mo t
-     (t,_) <- inferLType g t
-     if isOpt "flat" os
-       then fmap (map evalStr) (normalFlatForm g t)
-       else fmap (singleton . evalStr) (normalForm g t)
+  do mo <- maybe (raise "no source grammar in scope") return $
+           greatestResource sgr
+     ((t,_),_) <- runCheck $ do t <- renameSourceTerm sgr mo t
+                                inferLType sgr [] t
+     let opts = modifyFlags (\fs->fs{optTrace=isOpt "trace" os})
+         t1 = CN.normalForm (CN.resourceValues opts sgr) (L NoLoc identW) t
+         t2 = evalStr t1
+     checkPredefError t2
   where
     -- ** Try to compute pre{...} tokens in token sequences
-    singleton x = [x]
-
-    g = Gl sgr (stdPredef g)
-
     evalStr t =
       case t of
         C t1 t2 -> foldr1 C (evalC [t])

src/compiler/GF/Command/TreeOperations.hs

@@ -1,9 +1,10 @@
 module GF.Command.TreeOperations (
   treeOp,
   allTreeOps,
+  treeChunks
   ) where
 
-import PGF2(Expr,PGF,Fun,compute,mkApp,unApp,unMeta,exprSize,exprFunctions)
+import PGF2(Expr,PGF,Fun,compute,mkApp,unApp,unapply,unMeta,exprSize,exprFunctions)
 import Data.List
 
 type TreeOp = [Expr] -> [Expr]
@@ -33,6 +34,16 @@ largest = reverse . smallest
 smallest :: [Expr] -> [Expr]
 smallest = sortBy (\t u -> compare (exprSize t) (exprSize u))
 
+treeChunks :: Expr -> [Expr]
+treeChunks = snd . cks where
+  cks t = 
+    case unapply t of
+      (t, ts) -> case unMeta t of
+                   Just _  -> (False,concatMap (snd . cks) ts)
+                   Nothing -> case unzip (map cks ts) of
+                                (bs,_) | and bs      -> (True, [t])
+                                (_,cts)              -> (False,concat cts)
+
 subtrees :: Expr -> [Expr]
 subtrees t = t : case unApp t of
   Just (f,ts) -> concatMap subtrees ts

src/compiler/GF/Compile.hs

@@ -1,50 +1,42 @@
 module GF.Compile (compileToPGF, link, batchCompile, srcAbsName) where
 
-import GF.Compile.GeneratePMCFG(generatePMCFG)
 import GF.Compile.GrammarToPGF(grammar2PGF)
 import GF.Compile.ReadFiles(ModEnv,getOptionsFromFile,getAllFiles,
                             importsOfModule)
 import GF.CompileOne(compileOne)
 
-import GF.Grammar.Grammar(Grammar,emptyGrammar,modules,mGrammar,
-                          abstractOfConcrete,prependModule,ModuleInfo(..))
+import GF.Grammar.Grammar(Grammar,emptyGrammar,
+                          abstractOfConcrete,prependModule)--,msrc,modules
 
-import GF.Infra.CheckM
 import GF.Infra.Ident(ModuleName,moduleNameS)--,showIdent
 import GF.Infra.Option
 import GF.Infra.UseIO(IOE,FullPath,liftIO,getLibraryDirectory,putIfVerb,
-                      justModuleName,extendPathEnv,putStrE,putPointE,warnOut)
+                      justModuleName,extendPathEnv,putStrE,putPointE)
 import GF.Data.Operations(raise,(+++),err)
 
 import Control.Monad(foldM,when,(<=<))
-import GF.System.Directory(getCurrentDirectory,doesFileExist,getModificationTime)
+import GF.System.Directory(doesFileExist,getModificationTime)
 import System.FilePath((</>),isRelative,dropFileName)
-import qualified Data.Map as Map(empty,singleton,insert,elems)
+import qualified Data.Map as Map(empty,insert,elems) --lookup
 import Data.List(nub)
 import Data.Time(UTCTime)
 import GF.Text.Pretty(render,($$),(<+>),nest)
 
-import PGF2(PGF,abstractName,pgfFilePath,readProbabilitiesFromFile)
+import PGF2(PGF,readProbabilitiesFromFile)
 
 -- | Compiles a number of source files and builds a 'PGF' structure for them.
 -- This is a composition of 'link' and 'batchCompile'.
-compileToPGF :: Options -> Maybe PGF -> [FilePath] -> IOE PGF
-compileToPGF opts mb_pgf fs = link opts mb_pgf =<< batchCompile opts mb_pgf fs
+compileToPGF :: Options -> [FilePath] -> IOE PGF
+compileToPGF opts fs = link opts . snd =<< batchCompile opts fs
 
 -- | Link a grammar into a 'PGF' that can be used to 'PGF.linearize' and
 -- 'PGF.parse' with the "PGF" run-time system.
-link :: Options -> Maybe PGF -> (ModuleName,Grammar) -> IOE PGF
-link opts mb_pgf (cnc,gr) =
+link :: Options -> (ModuleName,Grammar) -> IOE PGF
+link opts (cnc,gr) =
   putPointE Normal opts "linking ... " $ do
     let abs = srcAbsName gr cnc
-
-    -- if a module was compiled with no-pmcfg then we generate now
-    cwd <- getCurrentDirectory
-    (gr',warnings) <- runCheck' opts (fmap mGrammar $ mapM (generatePMCFG opts cwd gr) (modules gr))
-    warnOut opts warnings
-
     probs <- liftIO (maybe (return Map.empty) readProbabilitiesFromFile (flag optProbsFile opts))
-    pgf <- grammar2PGF opts mb_pgf gr' abs probs
+    pgf <- grammar2PGF opts gr abs probs
     when (verbAtLeast opts Normal) $ putStrE "OK"
     return pgf
 
@@ -56,17 +48,28 @@ srcAbsName gr cnc = err (const cnc) id $ abstractOfConcrete gr cnc
 -- used, in which case tags files are produced instead).
 -- Existing @.gfo@ files are reused if they are up-to-date
 -- (unless the option @-src@ aka @-force-recomp@ is used).
-batchCompile :: Options -> Maybe PGF -> [FilePath] -> IOE (ModuleName,Grammar)
-batchCompile opts mb_pgf files = do
-  menv <- emptyCompileEnv mb_pgf
-  (gr,menv) <- foldM (compileModule opts) menv files
+batchCompile :: Options -> [FilePath] -> IOE (UTCTime,(ModuleName,Grammar))
+batchCompile opts files = do
+  (gr,menv) <- foldM (compileModule opts) emptyCompileEnv files
   let cnc = moduleNameS (justModuleName (last files))
-  return (cnc,gr)
+      t = maximum . map fst $ Map.elems menv
+  return (t,(cnc,gr))
+{-
+-- to compile a set of modules, e.g. an old GF or a .cf file
+compileSourceGrammar :: Options -> Grammar -> IOE Grammar
+compileSourceGrammar opts gr = do
+  cwd <- getCurrentDirectory
+  (_,gr',_) <- foldM (\env -> compileSourceModule opts cwd env Nothing)
+                     emptyCompileEnv
+                     (modules gr)
+  return gr'
+-}
 
 -- | compile with one module as starting point
 -- command-line options override options (marked by --#) in the file
 -- As for path: if it is read from file, the file path is prepended to each name.
 -- If from command line, it is used as it is.
+
 compileModule :: Options -- ^ Options from program command line and shell command.
               -> CompileEnv -> FilePath -> IOE CompileEnv
 compileModule opts1 env@(_,rfs) file =
@@ -105,25 +108,14 @@ compileOne' opts env@(gr,_) = extendCompileEnv env <=< compileOne opts gr
 -- | The environment
 type CompileEnv = (Grammar,ModEnv)
 
-emptyCompileEnv :: Maybe PGF -> IOE CompileEnv
-emptyCompileEnv mb_pgf = do
-  case mb_pgf of
-    Just pgf -> do let abs_name = abstractName pgf
-                   env <- case pgfFilePath pgf of
-                            Just fpath -> do t <- getModificationTime fpath
-                                             return (Map.singleton abs_name (fpath,t,[]))
-                            Nothing    -> return Map.empty
-                   return ( prependModule emptyGrammar (moduleNameS abs_name, ModPGF pgf)
-                          , env
-                          )
-    Nothing  -> return (emptyGrammar,Map.empty)
-
+emptyCompileEnv :: CompileEnv
+emptyCompileEnv = (emptyGrammar,Map.empty)
 
 extendCompileEnv (gr,menv) (mfile,mo) =
   do menv2 <- case mfile of
                 Just file ->
                   do let (mod,imps) = importsOfModule mo
                      t <- getModificationTime file
-                     return $ Map.insert mod (file,t,imps) menv
+                     return $ Map.insert mod (t,imps) menv
                 _ -> return menv
      return (prependModule gr mo,menv2)

src/compiler/GF/Compile/CFGtoPGF.hs

@@ -7,6 +7,7 @@ import GF.Infra.Option
 import GF.Compile.OptimizePGF
 
 import PGF2
+import PGF2.Internal
 
 import qualified Data.Set as Set
 import qualified Data.Map as Map
@@ -20,7 +21,7 @@ import Data.Maybe(fromMaybe)
 --------------------------
 
 cf2pgf :: Options -> FilePath -> ParamCFG -> Map.Map Fun Double -> PGF
-cf2pgf opts fpath cf probs = error "TODO: cf2pgf" {-
+cf2pgf opts fpath cf probs = 
  build (let abstr = cf2abstr cf probs
         in newPGF [] aname abstr [(cname, cf2concr opts abstr cf)])
  where
@@ -133,4 +134,4 @@ mkRuleName rule =
   case ruleName rule of
 	CFObj n _ -> n
 	_         -> "_"
--}
+

src/compiler/GF/Compile/CheckGrammar.hs

@@ -5,7 +5,7 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/11/11 23:24:33 $
+-- > CVS $Date: 2005/11/11 23:24:33 $ 
 -- > CVS $Author: aarne $
 -- > CVS $Revision: 1.31 $
 --
@@ -22,13 +22,13 @@
 
 module GF.Compile.CheckGrammar(checkModule) where
 
-import Prelude hiding ((<>))
 import GF.Infra.Ident
 import GF.Infra.Option
 
 import GF.Compile.TypeCheck.Abstract
-import GF.Compile.TypeCheck.Concrete(checkLType,inferLType)
-import GF.Compile.Compute.Concrete2(normalForm,Globals(..),stdPredef)
+import GF.Compile.TypeCheck.RConcrete
+import qualified GF.Compile.TypeCheck.ConcreteNew as CN
+import qualified GF.Compile.Compute.ConcreteNew as CN
 
 import GF.Grammar
 import GF.Grammar.Lexer
@@ -53,7 +53,11 @@ checkModule opts cwd sgr mo@(m,mi) = do
                              checkCompleteGrammar opts cwd gr (a,abs) mo
           _            -> return mo
   infoss <- checkInModule cwd mi NoLoc empty $ topoSortJments2 mo
-  foldM (foldM (checkInfo opts cwd sgr)) mo infoss
+  foldM updateCheckInfos mo infoss
+  where
+    updateCheckInfos mo = fmap (foldl update mo) . parallelCheck . map check
+      where check (i,info) = fmap ((,) i) (checkInfo opts cwd sgr mo i info)
+    update mo@(m,mi) (i,info) = (m,mi{jments=Map.insert i info (jments mi)})
 
 -- check if restricted inheritance modules are still coherent
 -- i.e. that the defs of remaining names don't depend on omitted names
@@ -64,14 +68,14 @@ checkRestrictedInheritance cwd sgr (name,mo) = checkInModule cwd mo NoLoc empty
                              -- the restr. modules themself, with restr. infos
   mapM_ checkRem mrs
  where
-   mos = [mo | mo@(_,ModInfo{}) <- modules sgr]
+   mos = modules sgr
    checkRem ((i,m),mi) = do
      let (incl,excl) = partition (isInherited mi) (Map.keys (jments m))
      let incld c   = Set.member c (Set.fromList incl)
      let illegal c = Set.member c (Set.fromList excl)
-     let illegals = [(f,is) |
+     let illegals = [(f,is) | 
            (f,cs) <- allDeps, incld f, let is = filter illegal cs, not (null is)]
-     case illegals of
+     case illegals of 
        [] -> return ()
        cs -> checkWarn ("In inherited module" <+> i <> ", dependence of excluded constants:" $$
                          nest 2 (vcat [f <+> "on" <+> fsep is | (f,is) <- cs]))
@@ -87,12 +91,12 @@ checkCompleteGrammar opts cwd gr (am,abs) (cm,cnc) = checkInModule cwd cnc NoLoc
 
   -- check that all abstract constants are in concrete; build default lin and lincats
   jsc <- foldM checkAbs jsc (Map.toList jsa)
-
+  
   return (cm,cnc{jments=jsc})
   where
    checkAbs js i@(c,info) =
      case info of
-       AbsFun (Just (L loc ty)) _ _ _
+       AbsFun (Just (L loc ty)) _ _ _ 
            -> do let mb_def = do
                        let (cxt,(_,i),_) = typeForm ty
                        info <- lookupIdent i js
@@ -115,7 +119,8 @@ checkCompleteGrammar opts cwd gr (am,abs) (cm,cnc) = checkInModule cwd cnc NoLoc
                                     return js
                    _ -> do
                      case mb_def of
-                       Ok def -> do linty <- linTypeOfType gr cm (L loc ty)
+                       Ok def -> do (cont,val) <- linTypeOfType gr cm ty
+                                    let linty = (snd (valCat ty),cont,val)
                                     return $ Map.insert c (CncFun (Just linty) (Just (L NoLoc def)) Nothing Nothing) js
                        Bad _  -> do noLinOf c
                                     return js
@@ -130,12 +135,13 @@ checkCompleteGrammar opts cwd gr (am,abs) (cm,cnc) = checkInModule cwd cnc NoLoc
            checkWarn ("no linearization type for" <+> c <> ", inserting default {s : Str}")
            return $ Map.insert c (CncCat (Just (L NoLoc defLinType)) Nothing Nothing Nothing Nothing) js
        _ -> return js
-
+     
    checkCnc js (c,info) =
      case info of
        CncFun _ d mn mf -> case lookupOrigInfo gr (am,c) of
-                             Ok (_,AbsFun (Just (L loc ty)) _ _ _) ->
-                                        do linty <- linTypeOfType gr cm (L loc ty)
+                             Ok (_,AbsFun (Just (L _ ty)) _ _ _) -> 
+                                        do (cont,val) <- linTypeOfType gr cm ty
+                                           let linty = (snd (valCat ty),cont,val)
                                            return $ Map.insert c (CncFun (Just linty) d mn mf) js
                              _       -> do checkWarn ("function" <+> c <+> "is not in abstract")
                                            return js
@@ -151,125 +157,142 @@ checkCompleteGrammar opts cwd gr (am,abs) (cm,cnc) = checkInModule cwd cnc NoLoc
 
        _ -> return $ Map.insert c info js
 
-checkInfo :: Options -> FilePath -> SourceGrammar -> SourceModule -> (Ident,Info) -> Check SourceModule
-checkInfo opts cwd sgr sm (c,info) = checkInModule cwd (snd sm) NoLoc empty $ do
+
+-- | General Principle: only Just-values are checked. 
+-- A May-value has always been checked in its origin module.
+checkInfo :: Options -> FilePath -> SourceGrammar -> SourceModule -> Ident -> Info -> Check Info
+checkInfo opts cwd sgr (m,mo) c info = checkInModule cwd mo NoLoc empty $ do
   checkReservedId c
   case info of
-    AbsCat (Just (L loc cont)) ->
-      mkCheck loc "the category" $
+    AbsCat (Just (L loc cont)) -> 
+      mkCheck loc "the category" $ 
         checkContext gr cont
 
-    AbsFun (Just (L loc typ)) ma md moper -> do
+    AbsFun (Just (L loc typ0)) ma md moper -> do
+      typ <- compAbsTyp [] typ0   -- to calculate let definitions
       mkCheck loc "the type of function" $
         checkTyp gr typ
-      typ <- compAbsTyp [] typ   -- to calculate let definitions
       case md of
         Just eqs -> mapM_ (\(L loc eq) -> mkCheck loc "the definition of function" $
-                                          checkDef gr (fst sm,c) typ eq) eqs
+	                                        checkDef gr (m,c) typ eq) eqs
         Nothing  -> return ()
-      update sm c (AbsFun (Just (L loc typ)) ma md moper)
+      return (AbsFun (Just (L loc typ)) ma md moper)
 
     CncCat mty mdef mref mpr mpmcfg -> do
       mty  <- case mty of
-                Just (L loc typ) -> chIn loc "linearization type of" $ do
-                                      (typ,_) <- checkLType g typ typeType
-                                      typ  <- normalForm g typ
-                                      return (Just (L loc typ))
+                Just (L loc typ) -> chIn loc "linearization type of" $ 
+                                     (if False --flag optNewComp opts
+                                        then do (typ,_) <- CN.checkLType (CN.resourceValues opts gr) typ typeType
+                                                typ  <- computeLType gr [] typ
+                                                return (Just (L loc typ))
+                                        else do (typ,_) <- checkLType gr [] typ typeType
+                                                typ  <- computeLType gr [] typ
+                                                return (Just (L loc typ)))
                 Nothing          -> return Nothing
       mdef <- case (mty,mdef) of
-                (Just (L _ typ),Just (L loc def)) ->
+                (Just (L _ typ),Just (L loc def)) -> 
                     chIn loc "default linearization of" $ do
-                       (def,_) <- checkLType g def (mkFunType [typeStr] typ)
+                       (def,_) <- checkLType gr [] def (mkFunType [typeStr] typ)
                        return (Just (L loc def))
                 _ -> return Nothing
       mref <- case (mty,mref) of
-                (Just (L _ typ),Just (L loc ref)) ->
+                (Just (L _ typ),Just (L loc ref)) -> 
                     chIn loc "reference linearization of" $ do
-                       (ref,_) <- checkLType g ref (mkFunType [typ] typeStr)
+                       (ref,_) <- checkLType gr [] ref (mkFunType [typ] typeStr)
                        return (Just (L loc ref))
                 _ -> return Nothing
       mpr  <- case mpr of
-                (Just (L loc t)) ->
+                (Just (L loc t)) -> 
                     chIn loc "print name of" $ do
-                       (t,_) <- checkLType g t typeStr
+                       (t,_) <- checkLType gr [] t typeStr
                        return (Just (L loc t))
                 _ -> return Nothing
-      update sm c (CncCat mty mdef mref mpr mpmcfg)
+      return (CncCat mty mdef mref mpr mpmcfg)
 
     CncFun mty mt mpr mpmcfg -> do
       mt <- case (mty,mt) of
-              (Just (_,cat,cont,val),Just (L loc trm)) ->
+              (Just (cat,cont,val),Just (L loc trm)) -> 
                   chIn loc "linearization of" $ do
-                     (trm,_) <- checkLType g trm (mkFunType (map (\(_,_,ty) -> ty) cont) val)  -- erases arg vars
-                     return (Just (L loc (etaExpand [] trm cont)))
+                     (trm,_) <- checkLType gr [] trm (mkFunType (map (\(_,_,ty) -> ty) cont) val)  -- erases arg vars
+                     return (Just (L loc trm))
               _ -> return mt
       mpr  <- case mpr of
-                (Just (L loc t)) ->
+                (Just (L loc t)) -> 
                     chIn loc "print name of" $ do
-                       (t,_) <- checkLType g t typeStr
+                       (t,_) <- checkLType gr [] t typeStr
                        return (Just (L loc t))
                 _ -> return Nothing
-      update sm c (CncFun mty mt mpr mpmcfg)
+      return (CncFun mty mt mpr mpmcfg)
 
     ResOper pty pde -> do
       (pty', pde') <- case (pty,pde) of
          (Just (L loct ty), Just (L locd de)) -> do
-           ty'     <- chIn loct "operation" $ do
-                         (ty,_) <- checkLType g ty typeType
-                         normalForm g ty
+           ty'     <- chIn loct "operation" $
+                         (if False --flag optNewComp opts
+                            then CN.checkLType (CN.resourceValues opts gr) ty typeType >>= return . CN.normalForm (CN.resourceValues opts gr) (L loct c) . fst -- !!
+                            else checkLType gr [] ty typeType >>= computeLType gr [] . fst)
            (de',_) <- chIn locd "operation" $
-                         checkLType g de ty'
+                         (if False -- flag optNewComp opts
+                            then CN.checkLType (CN.resourceValues opts gr) de ty'
+                            else checkLType gr [] de ty')
            return (Just (L loct ty'), Just (L locd de'))
          (Nothing         , Just (L locd de)) -> do
            (de',ty') <- chIn locd "operation" $
-                          inferLType g de
+                          (if False -- flag optNewComp opts
+                            then CN.inferLType (CN.resourceValues opts gr) de
+                            else inferLType gr [] de)
            return (Just (L locd ty'), Just (L locd de'))
          (Just (L loct ty), Nothing) -> do
            chIn loct "operation" $
              checkError (pp "No definition given to the operation")
-      update sm c (ResOper pty' pde')
+      return (ResOper pty' pde')
 
     ResOverload os tysts -> chIn NoLoc "overloading" $ do
-      tysts' <- mapM (uncurry $ flip (\(L loc1 t) (L loc2 ty) -> checkLType g t ty >>= \(t,ty) -> return (L loc1 t, L loc2 ty))) tysts  -- return explicit ones
-      tysts0 <- lookupOverload gr (fst sm,c)  -- check against inherited ones too
-      tysts1 <- sequence
-                  [checkLType g tr (mkFunType args val) | (args,(val,tr)) <- tysts0]
+      tysts' <- mapM (uncurry $ flip (\(L loc1 t) (L loc2 ty) -> checkLType gr [] t ty >>= \(t,ty) -> return (L loc1 t, L loc2 ty))) tysts  -- return explicit ones
+      tysts0 <- lookupOverload gr (m,c)  -- check against inherited ones too
+      tysts1 <- mapM (uncurry $ flip (checkLType gr [])) 
+                  [(mkFunType args val,tr) | (args,(val,tr)) <- tysts0]
       --- this can only be a partial guarantee, since matching
       --- with value type is only possible if expected type is given
-      --checkUniq $
-      --  sort [let (xs,t) = typeFormCnc x in t : map (\(b,x,t) -> t) xs | (_,x) <- tysts1]
-      update sm c (ResOverload os [(y,x) | (x,y) <- tysts'])
+      checkUniq $ 
+        sort [let (xs,t) = typeFormCnc x in t : map (\(b,x,t) -> t) xs | (_,x) <- tysts1]
+      return (ResOverload os [(y,x) | (x,y) <- tysts'])
 
     ResParam (Just (L loc pcs)) _ -> do
-      (sm,cnt,ts,pcs) <- chIn loc "parameter type" $
-                            mkParamValues sm c 0 [] pcs
-      update sm c (ResParam (Just (L loc pcs)) (Just (ts,cnt)))
+      (vs,pcs) <- chIn loc "parameter type" $
+                    mkParams 0 [] pcs
+      return (ResParam (Just (L loc pcs)) (Just vs))
 
-    _ ->  return sm
+    ResValue (L loc ty) _ -> 
+      chIn loc "operation" $ do
+        let (_,Cn x) = typeFormCnc ty
+            is = case Map.lookup x (jments mo) of
+                   Just (ResParam (Just (L _ pcs)) _) -> [i | (f,_,i) <- pcs, f == c]
+                   _                                  -> []
+        case is of
+          [i] -> return (ResValue (L loc ty) i)
+          _   -> checkError (pp "Failed to find the value index for parameter" <+> pp c)
+
+    _ ->  return info
  where
-   gr = prependModule sgr sm
-   g = Gl gr (stdPredef g)
-   chIn loc cat = checkInModule cwd (snd sm) loc ("Happened in" <+> cat <+> c)
+   gr = prependModule sgr (m,mo)
+   chIn loc cat = checkInModule cwd mo loc ("Happened in" <+> cat <+> c)
 
-   mkParamValues sm         c cnt ts []           = return (sm,cnt,[],[])
-   mkParamValues sm@(mn,mi) c cnt ts ((p,co):pcs) = do
-     co <- mapM (\(b,v,ty) -> normalForm g ty >>= \ty -> return (b,v,ty)) co
-     sm <- case lookupIdent p (jments mi) of
-             Ok (ResValue (L loc _) _) -> update sm p (ResValue (L loc (mkProdSimple co (QC (mn,c)))) cnt)
-             Bad msg                   -> checkError (pp msg)
-     vs <- liftM sequence $ mapM (\(_,_,ty) -> allParamValues gr ty) co
-     (sm,cnt,ts,pcs) <- mkParamValues sm c (cnt+length vs) ts pcs
-     return (sm,cnt,map (mkApp (QC (mn,p))) vs ++ ts,(p,co):pcs)
+   mkParams i vs []             = return (vs,[])
+   mkParams i vs ((f,co,_):pcs) = do
+     vs0 <- liftM combinations $ mapM (\(_,_,ty) -> allParamValues gr ty) co
+     (vs,pcs) <- mkParams (i + length vs0) (vs ++ map (mkApp (QC (m,f))) vs0) pcs
+     return (vs,(f,co,i):pcs)
 
    checkUniq xss = case xss of
-     x:y:xs
+     x:y:xs 
       | x == y    -> checkError $ "ambiguous for type" <+>
-                                  ppTerm Terse 0 (mkFunType (tail x) (head x))
+                                  ppType (mkFunType (tail x) (head x))  
       | otherwise -> checkUniq $ y:xs
      _ -> return ()
 
    mkCheck loc cat ss = case ss of
-     [] -> return sm
+     [] -> return info
      _ -> chIn loc cat $ checkError (vcat ss)
 
    compAbsTyp g t = case t of
@@ -282,52 +305,37 @@ checkInfo opts cwd sgr sm (c,info) = checkInModule cwd (snd sm) NoLoc empty $ do
        t' <- compAbsTyp ((x,Vr x):g) t
        return $ Prod b x a' t'
      Abs _ _ _ -> return t
-     _ -> composOp (compAbsTyp g) t
-
-   etaExpand xs t            []               = t
-   etaExpand xs (Abs bt x t) (_        :cont) = Abs bt x (etaExpand (x:xs) t              cont)
-   etaExpand xs t            ((bt,_,ty):cont) = Abs bt x (etaExpand (x:xs) (App t (Vr x)) cont)
-     where
-       x = freeVar 1 xs
-
-       freeVar i xs
-         | elem x xs = freeVar (i+1) xs
-         | otherwise = x
-         where
-           x = identS ("v"++show i)
-
-   update (mn,mi) c info = return (mn,mi{jments=Map.insert c info (jments mi)})
+     _ -> composOp (compAbsTyp g) t  
 
 
 -- | for grammars obtained otherwise than by parsing ---- update!!
 checkReservedId :: Ident -> Check ()
 checkReservedId x =
-  when (isReservedWord GF x) $
+  when (isReservedWord x) $
        checkWarn ("reserved word used as identifier:" <+> x)
 
 -- auxiliaries
 
 -- | linearization types and defaults
-linTypeOfType :: Grammar -> ModuleName -> L Type -> Check ([Ident],Ident,Context,Type)
-linTypeOfType cnc m (L loc typ) = do
-  let (ctxt,res_cat) = typeSkeleton typ
-  val <- lookLin res_cat
-  lin_args <- mapM mkLinArg (zip [1..] ctxt)
-  let (args,arg_cats) = unzip lin_args
-  return (arg_cats, snd res_cat, args, val)
+linTypeOfType :: Grammar -> ModuleName -> Type -> Check (Context,Type)
+linTypeOfType cnc m typ = do
+  let (cont,cat) = typeSkeleton typ
+  val  <- lookLin cat
+  args <- mapM mkLinArg (zip [0..] cont)
+  return (args, val)
  where
    mkLinArg (i,(n,mc@(m,cat))) = do
      val  <- lookLin mc
      let vars = mkRecType varLabel $ replicate n typeStr
+	 symb = argIdent n cat i
      rec <- if n==0 then return val else
                        errIn (render ("extending" $$
                                       nest 2 vars $$
                                       "with" $$
                                       nest 2 val)) $
                              plusRecType vars val
-     return ((Explicit,varX i,rec),cat)
+     return (Explicit,symb,rec)
    lookLin (_,c) = checks [ --- rather: update with defLinType ?
-      lookupLincat cnc m c >>= normalForm g
+      lookupLincat cnc m c >>= computeLType cnc []
      ,return defLinType
      ]
-   g = Gl cnc (stdPredef g)

src/compiler/GF/Compile/Compute/AppPredefined.hs

@@ -0,0 +1,143 @@
+----------------------------------------------------------------------
+-- |
+-- Module      : AppPredefined
+-- Maintainer  : AR
+-- Stability   : (stable)
+-- Portability : (portable)
+--
+-- > CVS $Date: 2005/10/06 14:21:34 $ 
+-- > CVS $Author: aarne $
+-- > CVS $Revision: 1.13 $
+--
+-- Predefined function type signatures and definitions.
+-----------------------------------------------------------------------------
+
+module GF.Compile.Compute.AppPredefined ({-
+          isInPredefined, typPredefined, arrityPredefined, predefModInfo, appPredefined-}
+		  ) where
+{-
+import GF.Compile.TypeCheck.Primitives
+import GF.Infra.Option
+import GF.Data.Operations
+import GF.Grammar
+import GF.Grammar.Predef
+
+import qualified Data.Map as Map
+import GF.Text.Pretty
+import Data.Char (isUpper,toUpper,toLower)
+
+-- predefined function type signatures and definitions. AR 12/3/2003.
+
+isInPredefined :: Ident -> Bool
+isInPredefined f = Map.member f primitives
+
+arrityPredefined :: Ident -> Maybe Int
+arrityPredefined f = do ty <- typPredefined f
+                        let (ctxt,_) = typeFormCnc ty
+                        return (length ctxt)
+
+predefModInfo :: SourceModInfo
+predefModInfo = ModInfo MTResource MSComplete noOptions [] Nothing [] [] "Predef.gf" Nothing primitives
+
+appPredefined :: Term -> Err (Term,Bool)
+appPredefined t = case t of
+  App f x0 -> do
+   (x,_) <- appPredefined x0
+   case f of
+    -- one-place functions
+    Q (mod,f) | mod == cPredef ->
+      case x of
+        (K s) | f == cLength  -> retb $ EInt $ length s
+        (K s) | f == cIsUpper -> retb $ if (all isUpper s) then predefTrue else predefFalse
+        (K s) | f == cToUpper -> retb $ K $ map toUpper s
+        (K s) | f == cToLower -> retb $ K $ map toLower s
+        (K s) | f == cError   -> retb $ Error s
+
+        _                    -> retb t
+
+    -- two-place functions
+    App (Q (mod,f)) z0 | mod == cPredef -> do
+     (z,_) <- appPredefined z0
+     case (norm z, norm x) of
+      (EInt i, K s)    | f == cDrop    -> retb $ K (drop i s)
+      (EInt i, K s)    | f == cTake    -> retb $ K (take i s)
+      (EInt i, K s)    | f == cTk      -> retb $ K (take (max 0 (length s - i)) s)
+      (EInt i, K s)    | f == cDp      -> retb $ K (drop (max 0 (length s - i)) s)
+      (K s,    K t)    | f == cEqStr   -> retb $ if s == t then predefTrue else predefFalse
+      (K s,    K t)    | f == cOccur   -> retb $ if substring s t then predefTrue else predefFalse
+      (K s,    K t)    | f == cOccurs  -> retb $ if any (flip elem t) s then predefTrue else predefFalse
+      (EInt i, EInt j) | f == cEqInt   -> retb $ if i==j then predefTrue else predefFalse
+      (EInt i, EInt j) | f == cLessInt -> retb $ if i<j  then predefTrue else predefFalse
+      (EInt i, EInt j) | f == cPlus    -> retb $ EInt $ i+j
+      (_,      t)      | f == cShow  && notVar t  -> retb $ foldrC $ map K $ words $ render (ppTerm Unqualified 0 t)
+      (_,      K s)    | f == cRead    -> retb $ Cn (identS s) --- because of K, only works for atomic tags
+      (_,      t)      | f == cToStr   -> trm2str t >>= retb
+      _ -> retb t ---- prtBad "cannot compute predefined" t
+
+    -- three-place functions
+    App (App (Q (mod,f)) z0) y0 | mod == cPredef -> do
+     (y,_) <- appPredefined y0
+     (z,_) <- appPredefined z0
+     case (z, y, x) of
+       (ty,op,t) | f == cMapStr -> retf $ mapStr ty op t
+       _ | f == cEqVal && notVar y && notVar x -> retb $ if y==x then predefTrue else predefFalse
+       _ -> retb t ---- prtBad "cannot compute predefined" t
+
+    _ -> retb t ---- prtBad "cannot compute predefined" t
+  _ -> retb t
+                  ---- should really check the absence of arg variables
+ where
+   retb t = return (retc t,True)  -- no further computing needed
+   retf t = return (retc t,False) -- must be computed further
+   retc t = case t of
+     K [] -> t
+     K s  -> foldr1 C (map K (words s))
+     _    -> t
+   norm t = case t of
+     Empty -> K []
+     C u v -> case (norm u,norm v) of
+       (K x,K y) -> K (x +++ y)
+       _ -> t
+     _ -> t
+   notVar t = case t of
+     Vr _ -> False
+     App f a -> notVar f && notVar a
+     _ -> True ---- would need to check that t is a value
+   foldrC ts = if null ts then Empty else foldr1 C ts
+
+-- read makes variables into constants
+
+predefTrue = QC (cPredef,cPTrue)
+predefFalse = QC (cPredef,cPFalse)
+
+substring :: String -> String -> Bool
+substring s t = case (s,t) of
+  (c:cs, d:ds) -> (c == d && substring cs ds) || substring s ds
+  ([],_) -> True
+  _ -> False
+
+trm2str :: Term -> Err Term
+trm2str t = case t of
+  R ((_,(_,s)):_) -> trm2str s
+  T _ ((_,s):_)   -> trm2str s
+  V _ (s:_)       -> trm2str s
+  C _ _           -> return $ t
+  K _             -> return $ t
+  S c _           -> trm2str c
+  Empty           -> return $ t
+  _               -> Bad (render (text "cannot get Str from term" <+> ppTerm Unqualified 0 t))
+
+-- simultaneous recursion on type and term: type arg is essential!
+-- But simplify the task by assuming records are type-annotated
+-- (this has been done in type checking)
+mapStr :: Type -> Term -> Term -> Term
+mapStr ty f t = case (ty,t) of
+  _ | elem ty [typeStr,typeTok] -> App f t
+  (_,        R ts)    -> R [(l,mapField v)   | (l,v) <- ts]
+  (Table a b,T ti cs) -> T ti [(p,mapStr b f v) | (p,v) <- cs]
+  _    -> t 
+ where
+   mapField (mty,te) = case mty of
+     Just ty -> (mty,mapStr ty f te)
+     _ -> (mty,te)
+-}

src/compiler/GF/Compile/Compute/Concrete.hs

@@ -0,0 +1,3 @@
+module GF.Compile.Compute.Concrete{-(module M)-} where
+--import GF.Compile.Compute.ConcreteLazy as M -- New
+--import GF.Compile.Compute.ConcreteStrict as M -- Old, inefficient

src/compiler/GF/Compile/Compute/ConcreteNew.hs

@@ -0,0 +1,579 @@
+-- | Functions for computing the values of terms in the concrete syntax, in
+-- | preparation for PMCFG generation.
+module GF.Compile.Compute.ConcreteNew
+           (GlobalEnv, GLocation, resourceValues, geLoc, geGrammar,
+            normalForm,
+            Value(..), Bind(..), Env, value2term, eval, vapply
+           ) where
+
+import GF.Grammar hiding (Env, VGen, VApp, VRecType)
+import GF.Grammar.Lookup(lookupResDefLoc,allParamValues)
+import GF.Grammar.Predef(cPredef,cErrorType,cTok,cStr,cTrace,cPBool)
+import GF.Grammar.PatternMatch(matchPattern,measurePatt)
+import GF.Grammar.Lockfield(isLockLabel,lockRecType) --unlockRecord,lockLabel
+import GF.Compile.Compute.Value hiding (Error)
+import GF.Compile.Compute.Predef(predef,predefName,delta)
+import GF.Data.Str(Str,glueStr,str2strings,str,sstr,plusStr,strTok)
+import GF.Data.Operations(Err,err,errIn,maybeErr,combinations,mapPairsM)
+import GF.Data.Utilities(mapFst,mapSnd)
+import GF.Infra.Option
+import Control.Monad(ap,liftM,liftM2) -- ,unless,mplus
+import Data.List (findIndex,intersect,nub,elemIndex,(\\)) --,isInfixOf
+--import Data.Char (isUpper,toUpper,toLower)
+import GF.Text.Pretty
+import qualified Data.Map as Map
+import Debug.Trace(trace)
+
+-- * Main entry points
+
+normalForm :: GlobalEnv -> L Ident -> Term -> Term
+normalForm (GE gr rv opts _) loc = err (bugloc loc) id . nfx (GE gr rv opts loc)
+
+nfx env@(GE _ _ _ loc) t = do
+  v <- eval env [] t
+  case value2term loc [] v of
+    Left i  -> fail ("variable #"++show i++" is out of scope")
+    Right t -> return t
+
+eval :: GlobalEnv -> Env -> Term -> Err Value
+eval (GE gr rvs opts loc) env t = ($ (map snd env)) # value cenv t
+  where
+    cenv = CE gr rvs opts loc (map fst env)
+
+--apply env = apply' env
+
+--------------------------------------------------------------------------------
+
+-- * Environments
+
+type ResourceValues = Map.Map ModuleName (Map.Map Ident (Err Value))
+
+data GlobalEnv = GE Grammar ResourceValues Options GLocation
+data CompleteEnv = CE {srcgr::Grammar,rvs::ResourceValues,
+                       opts::Options,
+                       gloc::GLocation,local::LocalScope}
+type GLocation = L Ident
+type LocalScope = [Ident]
+type Stack = [Value]
+type OpenValue = Stack->Value
+
+geLoc     (GE _ _ _ loc) = loc
+geGrammar (GE gr _ _ _)  = gr
+
+ext b env = env{local=b:local env}
+extend bs env = env{local=bs++local env}
+global env = GE (srcgr env) (rvs env) (opts env) (gloc env)
+
+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)
+    ok v = --trace ("var "++show x++" = "++show v) $
+           v
+
+pick :: Int -> Stack -> Maybe Value
+pick 0 (v:_) = Just v
+pick i (_:vs) = pick (i-1) vs
+pick i vs = Nothing -- bug $ "pick "++show (i,vs)
+
+resource env (m,c) =
+--  err bug id $
+    if isPredefCat c
+    then value0 env =<< lockRecType c defLinType -- hmm
+    else maybe e id $ Map.lookup c =<< Map.lookup m (rvs env)
+  where e = fail $ "Not found: "++render m++"."++showIdent c
+
+-- | Convert operators once, not every time they are looked up
+resourceValues :: Options -> SourceGrammar -> GlobalEnv
+resourceValues opts gr = env
+  where
+    env = GE gr rvs opts (L NoLoc identW)
+    rvs = Map.mapWithKey moduleResources (moduleMap gr)
+    moduleResources m = Map.mapWithKey (moduleResource m) . jments
+    moduleResource m c _info = do L l t <- lookupResDefLoc gr (m,c)
+                                  let loc = L l c
+                                      qloc = L l (Q (m,c))
+                                  eval (GE gr rvs opts loc) [] (traceRes qloc t)
+
+    traceRes = if flag optTrace opts
+               then traceResource
+               else const id
+
+-- * Tracing
+
+-- | Insert a call to the trace function under the top-level lambdas
+traceResource (L l q) t =
+  case termFormCnc t of
+    (abs,body) -> mkAbs abs (mkApp traceQ [args,body])
+      where
+        args = R $ tuple2record (K lstr:[Vr x|(bt,x)<-abs,bt==Explicit])
+        lstr = render (l<>":"<>ppTerm Qualified 0 q)
+        traceQ = Q (cPredef,cTrace)
+
+-- * Computing values
+
+-- | Computing the value of a top-level term
+value0 :: CompleteEnv -> Term -> Err Value
+value0 env = eval (global env) []
+
+-- | Computing the value of a term
+value :: CompleteEnv -> Term -> Err OpenValue
+value env t0 =
+  -- Each terms is traversed only once by this function, using only statically
+  -- available information. Notably, the values of lambda bound variables 
+  -- will be unknown during the term traversal phase.
+  -- The result is an OpenValue, which is a function that may be applied many
+  -- times to different dynamic values, but without the term traversal overhead
+  -- and without recomputing other statically known information.
+  -- For this to work, there should be no recursive calls under lambdas here.
+  -- Whenever we need to construct the OpenValue function with an explicit
+  -- lambda, we have to lift the recursive calls outside the lambda.
+  -- (See e.g. the rules for Let, Prod and Abs)
+{-
+  trace (render $ text "value"<+>sep [ppL (gloc env)<>text ":",
+                                      brackets (fsep (map ppIdent (local env))),
+                                      ppTerm Unqualified 10 t0]) $
+--}
+  errIn (render t0) $
+  case t0 of
+    Vr x   -> var env x
+    Q x@(m,f)
+      | m == cPredef -> if f==cErrorType                -- to be removed
+                        then let p = identS "P"
+                             in const # value0 env (mkProd [(Implicit,p,typeType)] (Vr p) [])
+                        else if f==cPBool
+                               then const # resource env x
+                               else const . flip VApp [] # predef f
+      | otherwise    -> const # resource env x --valueResDef (fst env) x
+    QC x   -> return $ const (VCApp x [])
+    App e1 e2 -> apply' env e1 . (:[]) =<< value env e2
+    Let (x,(oty,t)) body -> do vb <- value (ext x env) body
+                               vt <- value env t
+                               return $ \ vs -> vb (vt vs:vs)
+    Meta i -> return $ \ vs -> VMeta i (zip (local env) vs) []
+    Prod bt x t1 t2 ->
+       do vt1 <- value env t1
+          vt2 <- value (ext x env) t2
+          return $ \ vs -> VProd bt (vt1 vs) x $ Bind $ \ vx -> vt2 (vx:vs)
+    Abs bt x t -> do vt <- value (ext x env) t
+                     return $ VAbs bt x . Bind . \ vs vx -> vt (vx:vs)
+    EInt n -> return $ const (VInt n)
+    EFloat f -> return $ const (VFloat f)
+    K s -> return $ const (VString s)
+    Empty -> return $ const (VString "")
+    Sort s | s == cTok -> return $ const (VSort cStr)        -- to be removed 
+           | otherwise -> return $ const (VSort s)
+    ImplArg t -> (VImplArg.) # value env t
+    Table p res -> liftM2 VTblType # value env p <# value env res
+    RecType rs -> do lovs <- mapPairsM (value env) rs
+                     return $ \vs->VRecType $ mapSnd ($vs) lovs
+    t@(ExtR t1 t2) -> ((extR t.)# both id) # both (value env) (t1,t2)
+    FV ts   -> ((vfv .) # sequence) # mapM (value env) ts
+    R as    -> do lovs <- mapPairsM (value env.snd) as
+                  return $ \ vs->VRec $ mapSnd ($vs) lovs
+    T i cs  -> valueTable env i cs
+    V ty ts -> do pvs <- paramValues env ty
+                  ((VV ty pvs .) . sequence) # mapM (value env) ts
+    C t1 t2 -> ((ok2p vconcat.) # both id) # both (value env) (t1,t2)
+    S t1 t2 -> ((select env.) # both id) # both (value env) (t1,t2)
+    P t l   -> --maybe (bug $ "project "++show l++" from "++show v) id $
+               do ov <- value env t
+                  return $ \ vs -> let v = ov vs
+                                   in maybe (VP v l) id (proj l v)
+    Alts t tts -> (\v vts -> VAlts # v <# mapM (both id) vts) # value env t <# mapM (both (value env)) tts
+    Strs ts    -> ((VStrs.) # sequence) # mapM (value env) ts
+    Glue t1 t2 -> ((ok2p (glue env).) # both id) # both (value env) (t1,t2)
+    ELin c r -> (unlockVRec (gloc env) c.) # value env r
+    EPatt p  -> return $ const (VPatt p) -- hmm
+    EPattType ty -> do vt <- value env ty
+                       return (VPattType . vt)
+    Typed t ty -> value env t
+    t -> fail.render $ "value"<+>ppTerm Unqualified 10 t $$ show t
+
+vconcat vv@(v1,v2) =
+    case vv of
+      (VString "",_) -> v2
+      (_,VString "") -> v1
+      (VApp NonExist _,_) -> v1
+      (_,VApp NonExist _) -> v2
+      _ -> VC v1 v2
+
+proj l v | isLockLabel l = return (VRec [])
+                ---- a workaround 18/2/2005: take this away and find the reason
+                ---- why earlier compilation destroys the lock field
+proj l v =
+    case v of
+      VFV vs -> liftM vfv (mapM (proj l) vs)
+      VRec rs -> lookup l rs
+--    VExtR v1 v2 -> proj l v2 `mplus` proj l v1 -- hmm
+      VS (VV pty pvs rs) v2 -> flip VS v2 . VV pty pvs # mapM (proj l) rs
+      _ -> return (ok1 VP v l)
+
+ok1 f v1@(VError {}) _ = v1
+ok1 f v1 v2 = f v1 v2
+ 
+ok2 f v1@(VError {}) _ = v1
+ok2 f _ v2@(VError {}) = v2
+ok2 f v1 v2 = f v1 v2
+
+ok2p f (v1@VError {},_) = v1
+ok2p f (_,v2@VError {}) = v2
+ok2p f vv = f vv
+
+unlockVRec loc c0 v0 = v0
+{-
+unlockVRec loc c0 v0 = unlockVRec' c0 v0
+  where
+    unlockVRec' ::Ident -> Value -> Value
+    unlockVRec' c v =
+        case v of
+    --    VClosure env t -> err bug (VClosure env) (unlockRecord c t)
+          VAbs bt x (Bind f) -> VAbs bt x (Bind $ \ v -> unlockVRec' c (f v))
+          VRec rs        -> plusVRec rs lock
+    --    _              -> VExtR v (VRec lock) -- hmm
+          _              -> {-trace (render $ ppL loc $ "unlock non-record "++show v0)-} v -- hmm
+    --    _              -> bugloc loc $ "unlock non-record "++show v0
+      where
+        lock = [(lockLabel c,VRec [])]
+-}
+
+-- suspicious, but backwards compatible
+plusVRec rs1 rs2 = VRec ([(l,v)|(l,v)<-rs1,l `notElem` ls2] ++ rs2)
+  where ls2 = map fst rs2
+
+extR t vv =
+    case vv of
+      (VFV vs,v2) -> vfv [extR t (v1,v2)|v1<-vs]
+      (v1,VFV vs) -> vfv [extR t (v1,v2)|v2<-vs]
+      (VRecType rs1, VRecType rs2) ->
+          case intersect (map fst rs1) (map fst rs2) of
+            [] -> VRecType (rs1 ++ rs2)
+            ls -> error $ "clash"<+>show ls
+      (VRec     rs1, VRec     rs2) -> plusVRec rs1 rs2
+      (v1          , VRec [(l,_)]) | isLockLabel l -> v1 -- hmm
+      (VS (VV t pvs vs) s,v2) -> VS (VV t pvs [extR t (v1,v2)|v1<-vs]) s
+--    (v1,v2) -> ok2 VExtR v1 v2 -- hmm
+      (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
+  where
+    glu v1 v2 =
+        case (v1,v2) of
+          (VFV vs,v2) -> vfv [glu v1 v2|v1<-vs]
+          (v1,VFV vs) -> vfv [glu v1 v2|v2<-vs]
+          (VString s1,VString s2) -> VString (s1++s2)
+          (v1,VAlts d vs) -> VAlts (glx d) [(glx v,c) | (v,c) <- vs]
+             where glx v2 = glu v1 v2
+          (v1@(VAlts {}),v2) ->
+           --err (const (ok2 VGlue v1 v2)) id $
+             err bug id $
+             do y' <- strsFromValue v2
+                x' <- strsFromValue v1
+                return $ vfv [foldr1 VC (map VString (str2strings (glueStr v u))) | v <- x', u <- y']
+          (VC va vb,v2) -> VC va (glu vb v2)
+          (v1,VC va vb) -> VC (glu v1 va) vb
+          (VS (VV ty pvs vs) vb,v2) -> VS (VV ty pvs [glu v v2|v<-vs]) vb
+          (v1,VS (VV ty pvs vs) vb) -> VS (VV ty pvs [glu v1 v|v<-vs]) vb
+          (v1@(VApp NonExist _),_) -> v1
+          (_,v2@(VApp NonExist _)) -> v2
+--        (v1,v2) -> ok2 VGlue v1 v2
+          (v1,v2) -> if flag optPlusAsBind (opts env)
+                       then VC v1 (VC (VApp BIND []) v2)
+                       else let loc  = gloc env
+                                vt v = case value2term loc (local env) v of
+                                         Left i  -> Error ('#':show i)
+                                         Right t -> t
+                            in error . render $
+                                         ppL loc (hang "unsupported token gluing:" 4
+                                                        (Glue (vt v1) (vt v2)))
+
+
+-- | to get a string from a value that represents a sequence of terminals
+strsFromValue :: Value -> Err [Str]
+strsFromValue t = case t of
+  VString s   -> return [str s]
+  VC s t -> do
+    s' <- strsFromValue s
+    t' <- strsFromValue t
+    return [plusStr x y | x <- s', y <- t']
+{-
+  VGlue s t -> do
+    s' <- strsFromValue s
+    t' <- strsFromValue t
+    return [glueStr x y | x <- s', y <- t']
+-}
+  VAlts d vs -> do
+    d0 <- strsFromValue d
+    v0 <- mapM (strsFromValue . fst) vs
+    c0 <- mapM (strsFromValue . snd) vs
+  --let vs' = zip v0 c0
+    return [strTok (str2strings def) vars | 
+              def  <- d0,
+              vars <- [[(str2strings v, map sstr c) | (v,c) <- zip vv c0] | 
+                                                          vv <- combinations v0]
+           ]
+  VFV ts -> concat # mapM strsFromValue ts
+  VStrs ts -> concat # mapM strsFromValue ts
+
+  _ -> fail ("cannot get Str from value " ++ show t)
+
+vfv vs = case nub vs of
+           [v] -> v
+           vs -> VFV vs
+
+select env vv =
+    case vv of
+      (v1,VFV vs) -> vfv [select env (v1,v2)|v2<-vs]
+      (VFV vs,v2) -> vfv [select env (v1,v2)|v1<-vs]
+      (v1@(VV pty vs rs),v2) ->
+         err (const (VS v1 v2)) id $
+         do --ats <- allParamValues (srcgr env) pty
+            --let vs = map (value0 env) ats
+            i <- maybeErr "no match" $ findIndex (==v2) vs
+            return (ix (gloc env) "select" rs i)
+      (VT _ _ [(PW,Bind b)],_) -> {-trace "eliminate wild card table" $-} b []
+      (v1@(VT _ _ cs),v2) ->
+                 err (\_->ok2 VS v1 v2) (err bug id . valueMatch env) $
+                 match (gloc env) cs v2
+      (VS (VV pty pvs rs) v12,v2) -> VS (VV pty pvs [select env (v11,v2)|v11<-rs]) v12
+      (v1,v2) -> ok2 VS v1 v2
+
+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: "++)
+
+valueMatch :: CompleteEnv -> (Bind Env,Substitution) -> Err Value
+valueMatch env (Bind f,env') = f # mapPairsM (value0 env) env'
+
+valueTable :: CompleteEnv -> TInfo -> [Case] -> Err OpenValue
+valueTable env i cs =
+    case i of
+      TComp ty -> do pvs <- paramValues env ty
+                     ((VV ty pvs .) # sequence) # mapM (value env.snd) cs
+      _ -> do ty <- getTableType i
+              cs' <- mapM valueCase cs
+              err (dynamic cs' ty) return (convert cs' ty)
+  where
+    dynamic cs' ty _ = cases cs' # value env ty
+
+    cases cs' vty vs = err keep ($vs) (convertv cs' (vty vs))
+      where
+        keep msg = --trace (msg++"\n"++render (ppTerm Unqualified 0 (T i cs))) $
+                   VT wild (vty vs) (mapSnd ($vs) cs')
+
+    wild = case i of TWild _ -> True; _ -> False
+
+    convertv cs' vty = 
+      case value2term (gloc env) [] vty of
+        Left i    -> fail ("variable #"++show i++" is out of scope")
+        Right pty -> convert' cs' =<< paramValues'' env pty
+
+    convert cs' ty = convert' cs' =<< paramValues' env ty
+
+    convert' cs' ((pty,vs),pvs) =
+      do sts  <- mapM (matchPattern cs') vs
+         return $ \ vs -> VV pty pvs $ map (err bug id . valueMatch env)
+                                           (mapFst ($vs) sts)
+
+    valueCase (p,t) = do p' <- measurePatt # inlinePattMacro p
+                         pvs <- linPattVars p'
+                         vt <- value (extend pvs env) t
+                         return (p',\vs-> Bind $ \bs-> vt (push' p' bs pvs vs))
+
+    inlinePattMacro p =
+        case p of
+          PM qc -> do r <- resource env qc
+                      case r of
+                        VPatt p' -> inlinePattMacro p'
+                        _ -> ppbug $ hang "Expected pattern macro:" 4
+                                          (show r)
+          _ -> composPattOp inlinePattMacro p
+
+
+paramValues env ty = snd # paramValues' env ty
+
+paramValues' env ty = paramValues'' env =<< nfx (global env) ty
+
+paramValues'' env pty = do ats <- allParamValues (srcgr env) pty
+                           pvs <- mapM (eval (global env) []) ats
+                           return ((pty,ats),pvs)
+
+push' p bs xs = if length bs/=length xs
+                then bug $ "push "++show (p,bs,xs)
+                else push bs xs
+
+push :: Env -> LocalScope -> Stack -> Stack
+push bs [] vs = vs
+push bs (x:xs) vs = maybe err id (lookup x bs):push bs xs vs
+  where  err = bug $ "Unbound pattern variable "++showIdent x
+
+apply' :: CompleteEnv -> Term -> [OpenValue] -> Err OpenValue
+apply' env t [] = value env t
+apply' env t vs =
+  case t of
+    QC x                   -> return $ \ svs -> VCApp x (map ($svs) vs)
+{-
+    Q x@(m,f) | m==cPredef -> return $
+                              let constr = --trace ("predef "++show x) .
+                                           VApp x 
+                              in \ svs -> maybe constr id (Map.lookup f predefs)
+                                          $ map ($svs) vs
+              | otherwise  -> do r <- resource env x
+                                 return $ \ svs -> vapply (gloc env) r (map ($svs) vs)
+-}
+    App t1 t2              -> apply' env t1 . (:vs) =<< value env t2
+    _                      -> do fv <- value env t
+                                 return $ \ svs -> vapply (gloc env) (fv svs) (map ($svs) vs)
+
+vapply :: GLocation -> Value -> [Value] -> Value
+vapply loc v [] = v
+vapply loc v vs =
+  case v of
+    VError {} -> v
+--  VClosure env (Abs b x t) -> beta gr env b x t vs
+    VAbs bt _ (Bind f) -> vbeta loc bt f vs
+    VApp pre vs1 -> delta' pre (vs1++vs)
+      where
+        delta' Trace (v1:v2:vs) = let vr = vapply loc v2 vs
+                                  in vtrace loc v1 vr
+        delta' pre vs = err msg vfv $ mapM (delta pre) (varyList vs)
+        --msg = const (VApp pre (vs1++vs))
+        msg = bug . (("Applying Predef."++showIdent (predefName pre)++": ")++)
+    VS (VV t pvs fs) s -> VS (VV t pvs [vapply loc f vs|f<-fs]) s
+    VFV fs -> vfv [vapply loc f vs|f<-fs]
+    VCApp f vs0 -> VCApp f (vs0++vs)
+    VMeta i env vs0 -> VMeta i env (vs0++vs)
+    VGen i vs0 -> VGen i (vs0++vs)
+    v -> bug $ "vapply "++show v++" "++show vs
+
+vbeta loc bt f (v:vs) =
+  case (bt,v) of
+    (Implicit,VImplArg v) -> ap v
+    (Explicit,         v) -> ap v
+  where
+    ap (VFV avs) = vfv [vapply loc (f v) vs|v<-avs]
+    ap v         = vapply loc (f v) vs
+
+vary (VFV vs) = vs
+vary v = [v]
+varyList = mapM vary
+
+{-
+beta env b x t (v:vs) =
+  case (b,v) of
+    (Implicit,VImplArg v) -> apply' (ext (x,v) env) t vs
+    (Explicit,         v) -> apply' (ext (x,v) env) t vs
+-}
+
+vtrace loc arg res = trace (render (hang (pv arg) 4 ("->"<+>pv res))) res
+  where
+    pv v = case v of
+             VRec (f:as) -> hang (pf f) 4 (fsep (map pa as))
+             _ -> ppV v
+    pf (_,VString n) = pp n
+    pf (_,v) = ppV v
+    pa (_,v) = ppV v
+    ppV v = case value2term' True loc [] v of
+              Left i  -> "variable #" <> pp i <+> "is out of scope"
+              Right t -> ppTerm Unqualified 10 t
+
+-- | Convert a value back to a term
+value2term :: GLocation -> [Ident] -> Value -> Either Int Term
+value2term = value2term' False
+value2term' stop loc xs v0 =
+  case v0 of
+    VApp pre vs    -> liftM (foldl App (Q (cPredef,predefName pre))) (mapM v2t vs)
+    VCApp f vs     -> liftM  (foldl App (QC f))   (mapM v2t vs)
+    VGen j vs      -> liftM2 (foldl App) (var j)  (mapM v2t vs)
+    VMeta j env vs -> liftM  (foldl App (Meta j)) (mapM v2t vs)
+    VProd bt v x f -> liftM2 (Prod bt x) (v2t v) (v2t' x f)
+    VAbs  bt   x f -> liftM  (Abs  bt x)         (v2t' x f)
+    VInt n         -> return (EInt n)
+    VFloat f       -> return (EFloat f)
+    VString s      -> return (if null s then Empty else K s)
+    VSort s        -> return (Sort s)
+    VImplArg v     -> liftM  ImplArg (v2t v)
+    VTblType p res -> liftM2 Table (v2t p) (v2t res)
+    VRecType rs    -> liftM  RecType (mapM (\(l,v) -> fmap ((,) l) (v2t v)) rs)
+    VRec as        -> liftM  R       (mapM (\(l,v) -> v2t v >>= \t -> return (l,(Nothing,t))) as)
+    VV t _ vs      -> liftM  (V t)   (mapM v2t vs)
+    VT wild v cs   -> v2t v >>= \t -> liftM (T ((if wild then TWild else TTyped) t)) (mapM nfcase cs)
+    VFV vs         -> liftM  FV (mapM v2t vs)
+    VC v1 v2       -> liftM2 C (v2t v1) (v2t v2)
+    VS v1 v2       -> liftM2 S (v2t v1) (v2t v2)
+    VP v l         -> v2t v >>= \t -> return (P t l)
+    VPatt p        -> return (EPatt p)
+    VPattType v    -> v2t v >>= return . EPattType
+    VAlts v vvs    -> liftM2 Alts (v2t v) (mapM (\(x,y) -> liftM2 (,) (v2t x) (v2t y)) vvs)
+    VStrs vs       -> liftM  Strs (mapM v2t vs)
+--  VGlue v1 v2    -> Glue (v2t v1) (v2t v2)
+--  VExtR v1 v2    -> ExtR (v2t v1) (v2t v2)
+    VError err     -> return (Error err)
+    _              -> bug ("value2term "++show loc++" : "++show v0)
+  where
+    v2t = v2txs xs
+    v2txs = value2term' stop loc
+    v2t' x f = v2txs (x:xs) (bind f (gen xs))
+
+    var j
+      | j<length xs = Right (Vr (reverse xs !! j))
+      | otherwise   = Left  j
+
+
+    pushs xs e = foldr push e xs
+    push x (env,xs) = ((x,gen xs):env,x:xs)
+    gen xs = VGen (length xs) []
+
+    nfcase (p,f) = liftM ((,) p) (v2txs xs' (bind f env'))
+      where (env',xs') = pushs (pattVars p) ([],xs)
+
+    bind (Bind f) x = if stop
+                      then VSort (identS "...") -- hmm
+                      else f x
+
+
+linPattVars p =
+    if null dups
+    then return pvs
+    else fail.render $ hang "Pattern is not linear:" 4 (ppPatt Unqualified 0 p)
+  where
+    allpvs = allPattVars p
+    pvs = nub allpvs
+    dups = allpvs \\ pvs
+
+pattVars = nub . allPattVars
+allPattVars p =
+    case p of
+      PV i    -> [i]
+      PAs i p -> i:allPattVars p
+      _       -> collectPattOp allPattVars p
+
+---
+ix loc fn xs i =
+    if i<n
+    then xs !! i
+    else bugloc loc $ "(!!): index too large in "++fn++", "++show i++"<"++show n
+  where n = length xs
+
+infixl 1 #,<# --,@@
+
+f # x = fmap f x
+mf <# mx  = ap mf mx
+--m1 @@ m2 = (m1 =<<) . m2
+
+both f (x,y) = (,) # f x <# f y
+
+bugloc loc s = ppbug $ ppL loc s
+
+bug msg = ppbug msg
+ppbug doc = error $ render $ hang "Internal error in Compute.ConcreteNew:" 4 doc

src/compiler/GF/Compile/Compute/Predef.hs

@@ -0,0 +1,168 @@
+-- | Implementations of predefined functions
+{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
+module GF.Compile.Compute.Predef(predef,predefName,delta) where
+
+import qualified Data.Map as Map
+import Data.Array(array,(!))
+import Data.List (isInfixOf)
+import Data.Char (isUpper,toLower,toUpper)
+import Control.Monad(ap)
+
+import GF.Data.Utilities (apBoth) --mapSnd
+
+import GF.Compile.Compute.Value
+import GF.Infra.Ident (Ident,showIdent) --,varX
+import GF.Data.Operations(Err) -- ,err
+import GF.Grammar.Predef
+
+--------------------------------------------------------------------------------
+class Predef a where
+  toValue :: a -> Value
+  fromValue :: Value -> Err a
+
+instance Predef Int where
+  toValue = VInt
+  fromValue (VInt i) = return i
+  fromValue v = verror "Int" v
+
+instance Predef Bool where
+  toValue = boolV
+
+instance Predef String where
+  toValue = string
+  fromValue v = case norm v of
+                  VString s -> return s
+                  _ -> verror "String" v
+
+instance Predef Value where
+  toValue = id
+  fromValue = return
+
+instance Predef Predefined where
+  toValue p = VApp p []
+  fromValue v = case v of
+                  VApp p _ -> return p
+                  _        -> fail $ "Expected a predefined constant, got something else"
+
+{-
+instance (Predef a,Predef b) => Predef (a->b) where
+  toValue f = VAbs Explicit (varX 0) $ Bind $ err bug (toValue . f) . fromValue
+-}
+verror t v =
+  case v of
+    VError e -> fail e
+    VGen {}  -> fail $ "Expected a static value of type "++t
+                       ++", got a dynamic value"
+    _ -> fail $ "Expected a value of type "++t++", got "++show v
+
+--------------------------------------------------------------------------------
+
+predef f = maybe undef return (Map.lookup f predefs)
+  where
+    undef = fail $ "Unimplemented predfined operator: Predef."++showIdent f
+
+predefs :: Map.Map Ident Predefined
+predefs = Map.fromList predefList
+
+predefName pre = predefNames ! pre
+predefNames = array (minBound,maxBound) (map swap predefList)
+
+predefList =
+    [(cDrop,Drop),(cTake,Take),(cTk,Tk),(cDp,Dp),(cEqStr,EqStr),
+     (cOccur,Occur),(cOccurs,Occurs),(cToUpper,ToUpper),(cToLower,ToLower),
+     (cIsUpper,IsUpper),(cLength,Length),(cPlus,Plus),(cEqInt,EqInt),
+     (cLessInt,LessInt),
+     -- cShow, cRead, cMapStr, cEqVal
+     (cError,Error),(cTrace,Trace),
+     -- Canonical values:
+     (cPBool,PBool),(cPFalse,PFalse),(cPTrue,PTrue),(cInt,Int),(cFloat,Float),
+     (cInts,Ints),(cNonExist,NonExist)
+     ,(cBIND,BIND),(cSOFT_BIND,SOFT_BIND),(cSOFT_SPACE,SOFT_SPACE)
+     ,(cCAPIT,CAPIT),(cALL_CAPIT,ALL_CAPIT)]
+    --- add more functions!!!
+
+delta f vs =
+    case f of
+      Drop    -> fromNonExist vs NonExist (ap2 (drop::Int->String->String))
+      Take    -> fromNonExist vs NonExist (ap2 (take::Int->String->String))
+      Tk      -> fromNonExist vs NonExist (ap2 tk)
+      Dp      -> fromNonExist vs NonExist (ap2 dp)
+      EqStr   -> fromNonExist vs PFalse   (ap2 ((==)::String->String->Bool))
+      Occur   -> fromNonExist vs PFalse   (ap2 occur)
+      Occurs  -> fromNonExist vs PFalse   (ap2 occurs)
+      ToUpper -> fromNonExist vs NonExist (ap1 (map toUpper))
+      ToLower -> fromNonExist vs NonExist (ap1 (map toLower))
+      IsUpper -> fromNonExist vs PFalse   (ap1 (all' isUpper))
+      Length  -> fromNonExist vs (0::Int) (ap1 (length::String->Int))
+      Plus    -> ap2 ((+)::Int->Int->Int)
+      EqInt   -> ap2 ((==)::Int->Int->Bool)
+      LessInt -> ap2 ((<)::Int->Int->Bool)
+    {- -- | Show | Read | ToStr | MapStr | EqVal -}
+      Error   -> ap1 VError
+      Trace   -> ap2 vtrace
+      -- Canonical values:
+      PBool   -> canonical
+      Int     -> canonical
+      Float   -> canonical
+      Ints    -> canonical
+      PFalse  -> canonical
+      PTrue   -> canonical
+      NonExist-> canonical
+      BIND    -> canonical
+      SOFT_BIND->canonical
+      SOFT_SPACE->canonical
+      CAPIT   -> canonical
+      ALL_CAPIT->canonical
+  where
+    canonical = delay
+    delay = return (VApp f vs) -- wrong number of arguments
+
+    ap1 f = case vs of
+              [v1] -> (toValue . f) `fmap` fromValue v1
+              _ -> delay
+
+    ap2 f = case vs of
+             [v1,v2] -> toValue `fmap` (f `fmap` fromValue v1 `ap` fromValue v2)
+             _ -> delay
+
+    fromNonExist vs a b
+      | null [v | v@(VApp NonExist _) <- vs] = b
+      | otherwise                            = return (toValue a)
+
+    vtrace :: Value -> Value -> Value
+    vtrace x y = y -- tracing is implemented elsewhere
+
+--  unimpl id = bug $ "unimplemented predefined function: "++showIdent id
+--  problem id vs = bug $ "unexpected arguments: Predef."++showIdent id++" "++show vs
+
+    tk i s = take (max 0 (length s - i)) s :: String
+    dp i s = drop (max 0 (length s - i)) s :: String
+    occur s t = isInfixOf (s::String) (t::String)
+    occurs s t = any (`elem` (t::String)) (s::String)
+    all' = all :: (a->Bool) -> [a] -> Bool
+
+boolV b = VCApp (cPredef,if b then cPTrue else cPFalse) []
+
+norm v =
+  case v of
+    VC v1 v2 -> case apBoth norm (v1,v2) of
+                  (VString s1,VString s2) -> VString (s1++" "++s2)
+                  (v1,v2) -> VC v1 v2
+    _ -> v
+{-
+strict v = case v of
+             VError err -> Left err
+             _ -> Right v
+-}
+string s = case words s of
+             [] -> VString ""
+             ss -> foldr1 VC (map VString ss)
+
+---
+
+swap (x,y) = (y,x)
+{-
+bug msg = ppbug msg
+ppbug doc = error $ render $
+                    hang "Internal error in Compute.Predef:" 4 doc
+-}

src/compiler/GF/Compile/Compute/Value.hs

@@ -0,0 +1,56 @@
+module GF.Compile.Compute.Value where
+import GF.Grammar.Grammar(Label,Type,MetaId,Patt,QIdent)
+import PGF2(BindType)
+import GF.Infra.Ident(Ident)
+import Text.Show.Functions()
+import Data.Ix(Ix)
+
+-- | Self-contained (not quite) representation of values
+data Value
+  = VApp Predefined [Value] -- from Q, always Predef.x, has a built-in value
+  | VCApp QIdent [Value] -- from QC, constructors
+  | VGen Int [Value] -- for lambda bound variables, possibly applied
+  | VMeta MetaId Env [Value]
+-- -- | VClosure Env Term -- used in Typecheck.ConcreteNew
+  | VAbs BindType Ident Binding -- used in Compute.ConcreteNew
+  | VProd BindType Value Ident Binding -- used in Compute.ConcreteNew
+  | VInt Int
+  | VFloat Double
+  | VString String
+  | VSort Ident
+  | VImplArg Value
+  | VTblType Value Value
+  | VRecType [(Label,Value)]
+  | VRec [(Label,Value)]
+  | VV Type [Value] [Value] -- preserve type for conversion back to Term
+  | VT Wild Value [(Patt,Bind Env)]
+  | VC Value Value
+  | VS Value Value
+  | VP Value Label
+  | VPatt Patt
+  | VPattType Value
+  | VFV [Value]
+  | VAlts Value [(Value, Value)]
+  | VStrs [Value]
+-- -- | VGlue Value Value -- hmm
+-- --  | VExtR Value Value -- hmm
+  | VError String
+  deriving (Eq,Show)
+
+type Wild = Bool
+type Binding = Bind Value
+data Bind a = Bind (a->Value) deriving Show
+
+instance Eq (Bind a) where x==y = False
+
+type Env = [(Ident,Value)]
+
+-- | Predefined functions
+data Predefined = Drop | Take | Tk | Dp | EqStr | Occur | Occurs | ToUpper
+                | ToLower | IsUpper | Length | Plus | EqInt | LessInt 
+             {- | Show | Read | ToStr | MapStr | EqVal -}
+                | Error | Trace
+                -- Canonical values below:
+                | PBool | PFalse | PTrue | Int | Float | Ints | NonExist 
+                | BIND | SOFT_BIND | SOFT_SPACE | CAPIT | ALL_CAPIT
+                deriving (Show,Eq,Ord,Ix,Bounded,Enum)

src/compiler/GF/Compile/ConcreteToHaskell.hs

@@ -0,0 +1,416 @@
+-- | Translate concrete syntax to Haskell
+module GF.Compile.ConcreteToHaskell(concretes2haskell,concrete2haskell) where
+import Data.List(isPrefixOf,sort,sortOn)
+import qualified Data.Map as M
+import qualified Data.Set as S
+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.Infra.Option
+import GF.Haskell as H
+import GF.Grammar.Canonical as C
+import GF.Compile.GrammarToCanonical
+import Debug.Trace(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
+  ]
+
+-- | 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)
+  where
+    nl = Comment ""
+    recs = S.toList (S.difference (records (lcs,lns)) common_records)
+
+    labels = S.difference (S.unions (map S.fromList recs)) common_labels
+    common_records = S.fromList [[label_s]]
+    common_labels = S.fromList [label_s]
+    label_s = LabelId "s"
+
+    signature (CatDef c _) = TypeSig lf (Fun abs (pure lin))
+      where
+        abs = tcon0 (prefixIdent "A." (gId c))
+        lin = tcon0 lc
+        lf = linfunName c
+        lc = lincatName c
+
+    emptydefs = map emptydef (S.toList emptyCats)
+    emptydef c = Eqn (linfunName 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
+
+    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" $$
+      "----------------------------------------------------"
+      where
+        pure = if va then brackets else pp
+
+    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"]
+
+    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]
+
+
+--con = Cn . identS
+
+class Records t where
+  records :: t -> S.Set [LabelId]
+
+instance Records t => Records [t] where
+  records = S.unions . map records
+
+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
+
+
+-- | 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)->
+      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
+    _ -> t
+  where
+    app f ts = ParamConstant (Param f ts) -- !! a hack
+    to_rcon = ParamId . Unqual . to_rcon' . labels
+
+patVars p = []
+
+labels r = [l|RecordRow l _<-r]
+
+proj = Var . identS . proj'
+proj' (LabelId l) = "proj_"++l
+rcon = Var . rcon'
+rcon' = identS . rcon_name
+rcon_name ls = "R"++concat (sort ['_':l|LabelId l<-ls])
+
+to_rcon' = ("to_"++) . rcon_name
+
+recordType ls =
+    Data lhs [app] ["Eq","Ord","Show"]:
+    enumAllInstance:
+    zipWith projection vs ls ++
+    [Eqn (identS (to_rcon' ls),[VarP r])
+         (foldl Ap (Var cn) [Var (identS (proj' l)) `Ap` Var r|l<-ls])]
+  where
+    r = identS "r"
+    cn = rcon' ls
+ -- Not all record labels are syntactically correct as type variables in Haskell
+ -- app = cn<+>ls
+    lhs = ConAp cn vs -- don't reuse record labels
+    app = fmap TId lhs
+    tapp = foldl TAp (TId cn) (map TId vs)
+    vs = [identS ('t':show i)|i<-[1..n]]
+    n = length ls
+
+    projection v l = Instance [] (TId name `TAp` tapp `TAp` TId v)
+                              [((prj,[papp]),Var v)]
+     where
+       name = identS ("Has_"++render l)
+       prj = identS (proj' l)
+       papp = ConP cn (map VarP vs)
+
+    enumAllInstance =
+       Instance ctx (tEnumAll `TAp` tapp)[(lhs0 "enumAll",enumCon cn n)]
+      where
+        ctx =  [tEnumAll `TAp` TId v|v<-vs]
+        tEnumAll = TId (identS "EnumAll")
+
+labelClass l =
+    Class [] (ConAp name [r,a]) [([r],[a])]
+          [(identS (proj' l),TId r `Fun` TId a)]
+  where
+    name = identS ("Has_"++render l)
+    r = identS "r"
+    a = identS "a"
+
+enumCon name arity =
+    if arity==0
+    then single (Var name)
+    else foldl ap (single (Var name)) (replicate arity (Const "enumAll"))
+  where
+    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

src/compiler/GF/Compile/ExampleBased.hs

@@ -33,7 +33,7 @@ convertFile conf src file = do
       (ex,   end) = break (=='"') (tail exend)
     in ((unwords (words cat),ex), tail end)  -- quotes ignored
   pgf = resource_pgf conf
-  lang = concrete conf
+  lang = language conf 
   convEx (cat,ex) = do
     appn "("
     let typ = maybe (error "no valid cat") id $ readType cat
@@ -61,7 +61,7 @@ convertFile conf src file = do
 data ExConfiguration = ExConf {
   resource_pgf :: PGF,
   verbose  :: Bool,
-  concrete :: Concr,
+  language :: Concr,
   printExp :: Expr -> String
   }
 

src/compiler/GF/Compile/Export.hs

@@ -4,6 +4,7 @@ import PGF2
 import GF.Compile.PGFtoHaskell
 --import GF.Compile.PGFtoAbstract
 import GF.Compile.PGFtoJava
+import GF.Compile.PGFtoJSON
 import GF.Infra.Option
 --import GF.Speech.CFG
 import GF.Speech.PGFToCFG
@@ -34,7 +35,7 @@ exportPGF opts fmt pgf =
       FmtPGFPretty    -> multi "txt" (showPGF)
       FmtCanonicalGF  -> [] -- canon "gf" (render80 . abstract2canonical)
       FmtCanonicalJson-> []
-      FmtSourceJson   -> []
+      FmtJSON         -> multi "json"  pgf2json
       FmtHaskell      -> multi "hs"  (grammar2haskell opts name)
       FmtJava         -> multi "java" (grammar2java opts name)
       FmtBNF          -> single "bnf"   bnfPrinter
@@ -49,7 +50,6 @@ exportPGF opts fmt pgf =
       FmtSLF          -> single "slf"  slfPrinter
       FmtRegExp       -> single "rexp" regexpPrinter
       FmtFA           -> single "dot"  slfGraphvizPrinter
-      FmtLR           -> single "dot"  (\_ -> graphvizLRAutomaton)
  where
    name = fromMaybe (abstractName pgf) (flag optName opts)
 
@@ -60,3 +60,4 @@ exportPGF opts fmt pgf =
 
    single :: String -> (PGF -> Concr -> String) -> [(FilePath,String)]
    single ext pr = [(concreteName cnc <.> ext, pr pgf cnc) | cnc <- Map.elems (languages pgf)]
+

src/compiler/GF/Compile/GenerateBC.hs

@@ -4,8 +4,7 @@ module GF.Compile.GenerateBC(generateByteCode) where
 import GF.Grammar
 import GF.Grammar.Lookup(lookupAbsDef,lookupFunType)
 import GF.Data.Operations
-import PGF2(Literal(..))
-import PGF2.ByteCode
+import PGF2.Internal(CodeLabel,Instr(..),IVal(..),TailInfo(..),Literal(..))
 import qualified Data.Map as Map
 import Data.List(nub,mapAccumL)
 import Data.Maybe(fromMaybe)
@@ -19,7 +18,9 @@ generateByteCode gr arity eqs =
       b = if arity == 0 || null eqs
             then instrs
             else CHECK_ARGS arity:instrs
-  in reverse bs
+  in case bs of
+       [[FAIL]] -> []         -- in the runtime this is a more efficient variant of [[FAIL]]
+       _        -> reverse bs
   where
     is = push_is (arity-1) arity []
 

src/compiler/GF/Compile/GeneratePMCFG.hs

@@ -0,0 +1,621 @@
+{-# LANGUAGE BangPatterns, RankNTypes, FlexibleInstances, MultiParamTypeClasses, PatternGuards #-}
+----------------------------------------------------------------------
+-- |
+-- Maintainer  : Krasimir Angelov
+-- Stability   : (stable)
+-- Portability : (portable)
+--
+-- Convert PGF grammar to PMCFG grammar.
+--
+-----------------------------------------------------------------------------
+
+module GF.Compile.GeneratePMCFG
+    (generatePMCFG, pgfCncCat, addPMCFG, resourceValues
+    ) where
+
+import qualified PGF2 as PGF2
+import qualified PGF2.Internal as PGF2
+import PGF2.Internal(Symbol(..),fidVar)
+
+import GF.Infra.Option
+import GF.Grammar hiding (Env, mkRecord, mkTable)
+import GF.Grammar.Lookup
+import GF.Grammar.Predef
+import GF.Grammar.Lockfield (isLockLabel)
+import GF.Data.BacktrackM
+import GF.Data.Operations
+import GF.Infra.UseIO (ePutStr,ePutStrLn) -- IOE,
+import GF.Data.Utilities (updateNthM) --updateNth
+import GF.Compile.Compute.ConcreteNew(normalForm,resourceValues)
+import qualified Data.Map as Map
+import qualified Data.Set as Set
+import qualified Data.List as List
+--import qualified Data.IntMap as IntMap
+import qualified Data.IntSet as IntSet
+import GF.Text.Pretty
+import Data.Array.IArray
+import Data.Array.Unboxed
+--import Data.Maybe
+--import Data.Char (isDigit)
+import Control.Applicative(Applicative(..))
+import Control.Monad
+import Control.Monad.Identity
+--import Control.Exception
+--import Debug.Trace(trace)
+
+----------------------------------------------------------------------
+-- main conversion function
+
+--generatePMCFG :: Options -> SourceGrammar -> Maybe FilePath -> SourceModule -> IOE SourceModule
+generatePMCFG opts sgr opath cmo@(cm,cmi) = do
+  (seqs,js) <- mapAccumWithKeyM (addPMCFG opts gr cenv opath am cm) Map.empty (jments cmi)
+  when (verbAtLeast opts Verbose) $ ePutStrLn ""
+  return (cm,cmi{mseqs = Just (mkSetArray seqs), jments = js})
+  where
+    cenv = resourceValues opts gr
+    gr = prependModule sgr cmo
+    MTConcrete am = mtype cmi
+
+mapAccumWithKeyM :: (Monad m, Ord k) => (a -> k -> b -> m (a,c)) -> a
+                                     -> Map.Map k b -> m (a,Map.Map k c)
+mapAccumWithKeyM f a m = do let xs = Map.toAscList m
+                            (a,ys) <- mapAccumM f a xs
+                            return (a,Map.fromAscList ys)
+  where
+    mapAccumM f a []          = return (a,[])
+    mapAccumM f a ((k,x):kxs) = do (a,y ) <- f a k x
+                                   (a,kys) <- mapAccumM f a kxs
+                                   return (a,(k,y):kys)
+
+
+--addPMCFG :: Options -> SourceGrammar -> GlobalEnv -> Maybe FilePath -> Ident -> Ident -> SeqSet -> Ident -> Info -> IOE (SeqSet, Info)
+addPMCFG opts gr cenv opath am cm seqs id (CncFun mty@(Just (cat,cont,val)) mlin@(Just (L loc term)) mprn Nothing) = do
+--when (verbAtLeast opts Verbose) $ ePutStr ("\n+ "++showIdent id++" ...")
+  let pres  = protoFCat gr res val
+      pargs = [protoFCat gr (snd $ catSkeleton ty) lincat | ((_,_,ty),(_,_,lincat)) <- zip ctxt cont]
+
+      pmcfgEnv0   = emptyPMCFGEnv
+  b             <- convert opts gr cenv (floc opath loc id) term (cont,val) pargs
+  let (seqs1,b1) = addSequencesB seqs b
+      pmcfgEnv1  = foldBM addRule
+                          pmcfgEnv0
+                          (goB b1 CNil [])
+                          (pres,pargs)
+      pmcfg      = getPMCFG pmcfgEnv1
+      
+      stats      = let PMCFG prods funs = pmcfg
+                       (s,e)            = bounds funs
+                       !prods_cnt       = length prods
+                       !funs_cnt        = e-s+1
+                   in (prods_cnt,funs_cnt)
+
+  when (verbAtLeast opts Verbose) $
+    ePutStr ("\n+ "++showIdent id++" "++show (product (map catFactor pargs)))
+  seqs1 `seq` stats `seq` return ()
+  when (verbAtLeast opts Verbose) $ ePutStr (" "++show stats)
+  return (seqs1,CncFun mty mlin mprn (Just pmcfg))
+  where
+    (ctxt,res,_) = err bug typeForm (lookupFunType gr am id)
+
+    addRule lins (newCat', newArgs') env0 =
+      let [newCat] = getFIds newCat'
+          !fun     = mkArray lins
+          newArgs  = map getFIds newArgs'
+      in addFunction env0 newCat fun newArgs
+
+addPMCFG opts gr cenv opath am cm seqs id (CncCat mty@(Just (L _ lincat)) 
+                                                  mdef@(Just (L loc1 def))
+                                                  mref@(Just (L loc2 ref))
+                                                  mprn
+                                                  Nothing) = do
+  let pcat = protoFCat gr (am,id) lincat
+      pvar = protoFCat gr (MN identW,cVar) typeStr
+
+      pmcfgEnv0  = emptyPMCFGEnv
+
+  let lincont    = [(Explicit, varStr, typeStr)]
+  b             <- convert opts gr cenv (floc opath loc1 id) def (lincont,lincat) [pvar]
+  let (seqs1,b1) = addSequencesB seqs b
+      pmcfgEnv1  = foldBM addLindef
+                          pmcfgEnv0
+                          (goB b1 CNil [])
+                          (pcat,[pvar])
+
+  let lincont    = [(Explicit, varStr, lincat)]
+  b             <- convert opts gr cenv (floc opath loc2 id) ref (lincont,typeStr) [pcat]
+  let (seqs2,b2) = addSequencesB seqs1 b
+      pmcfgEnv2  = foldBM addLinref
+                          pmcfgEnv1
+                          (goB b2 CNil [])
+                          (pvar,[pcat])
+
+  let pmcfg     = getPMCFG pmcfgEnv2
+
+  when (verbAtLeast opts Verbose) $ ePutStr ("\n+ "++showIdent id++" "++show (catFactor pcat))
+  seqs2 `seq` pmcfg `seq` return (seqs2,CncCat mty mdef mref mprn (Just pmcfg))
+  where
+    addLindef lins (newCat', newArgs') env0 =
+      let [newCat] = getFIds newCat'
+          !fun     = mkArray lins
+      in addFunction env0 newCat fun [[fidVar]]
+
+    addLinref lins (newCat', [newArg']) env0 =
+      let newArg   = getFIds newArg'
+          !fun     = mkArray lins
+      in addFunction env0 fidVar fun [newArg]
+
+addPMCFG opts gr cenv opath am cm seqs id info = return (seqs, info)
+
+floc opath loc id = maybe (L loc id) (\path->L (External path loc) id) opath
+
+convert opts gr cenv loc term ty@(_,val) pargs =
+  case normalForm cenv loc (etaExpand ty term) of
+    Error s -> fail $ render $ ppL loc ("Predef.error: "++s)
+    term    -> return $ runCnvMonad gr (convertTerm opts CNil val term) (pargs,[])
+  where
+    etaExpand (context,val) = mkAbs pars . flip mkApp args
+      where pars = [(Explicit,v) | v <- vars]
+            args = map Vr vars
+            vars = map (\(bt,x,t) -> x) context
+
+pgfCncCat :: SourceGrammar -> PGF2.Cat -> Type -> Int -> (PGF2.Cat,Int,Int,[String])
+pgfCncCat gr id lincat index =
+  let ((_,size),schema) = computeCatRange gr lincat
+  in ( id
+     , index
+     , index+size-1
+     , map (renderStyle style{mode=OneLineMode} . ppPath)
+           (getStrPaths schema)
+     )
+  where
+    getStrPaths :: Schema Identity s c -> [Path]
+    getStrPaths = collect CNil []
+      where
+        collect path paths (CRec rs)   = foldr (\(lbl,Identity t) paths -> collect (CProj lbl path) paths t) paths rs
+        collect path paths (CTbl _ cs) = foldr (\(trm,Identity t) paths -> collect (CSel  trm path) paths t) paths cs
+        collect path paths (CStr _)    = reversePath path : paths
+        collect path paths (CPar _)    = paths
+
+----------------------------------------------------------------------
+-- CnvMonad monad
+--
+-- The branching monad provides backtracking together with
+-- recording of the choices made. We have two cases
+-- when we have alternative choices:
+--
+--      * when we have parameter type, then
+--        we have to try all possible values
+--      * when we have variants we have to try all alternatives
+--
+-- The conversion monad keeps track of the choices and they are
+-- returned as 'Branch' data type.
+
+data Branch a
+  = Case Int Path [(Term,Branch a)]
+  | Variant [Branch a]
+  | Return  a
+
+newtype CnvMonad a = CM {unCM :: SourceGrammar
+                              -> forall b . (a -> ([ProtoFCat],[Symbol]) -> Branch b)
+                              -> ([ProtoFCat],[Symbol])
+                              -> Branch b}
+
+instance Applicative CnvMonad where
+  pure = return
+  (<*>) = ap
+
+instance Monad CnvMonad where
+    return a   = CM (\gr c s -> c a s)
+    CM m >>= k = CM (\gr c s -> m gr (\a s -> unCM (k a) gr c s) s)
+
+instance MonadState ([ProtoFCat],[Symbol]) CnvMonad where
+    get = CM (\gr c s -> c s s)
+    put s = CM (\gr c _ -> c () s)
+
+instance Functor CnvMonad where
+    fmap f (CM m) = CM (\gr c s -> m gr (c . f) s)
+
+runCnvMonad :: SourceGrammar -> CnvMonad a -> ([ProtoFCat],[Symbol]) -> Branch a
+runCnvMonad gr (CM m) s = m gr (\v s -> Return v) s
+
+-- | backtracking for all variants
+variants :: [a] -> CnvMonad a
+variants xs = CM (\gr c s -> Variant [c x s | x <- xs])
+
+-- | backtracking for all parameter values that a variable could take
+choices :: Int -> Path -> CnvMonad Term
+choices nr path = do (args,_) <- get
+                     let PFCat _ _ schema = args !! nr
+                     descend schema path CNil
+  where
+    descend (CRec rs)     (CProj lbl path) rpath = case lookup lbl rs of
+                                                     Just (Identity t) -> descend t path (CProj lbl rpath)
+    descend (CRec rs)     CNil             rpath = do rs <- mapM (\(lbl,Identity t) -> fmap (assign lbl) (descend t CNil (CProj lbl rpath))) rs
+                                                      return (R rs)
+    descend (CTbl pt cs)  (CSel  trm path) rpath = case lookup trm cs of
+                                                     Just (Identity t) -> descend t path (CSel trm rpath)
+    descend (CTbl pt cs)  CNil             rpath = do cs <- mapM (\(trm,Identity t) -> descend t CNil (CSel trm rpath)) cs
+                                                      return (V pt cs)
+    descend (CPar (m,vs)) CNil             rpath = case vs of
+                                                     [(value,index)] -> return value
+                                                     values          -> let path = reversePath rpath
+                                                                        in CM (\gr c s -> Case nr path [(value, updateEnv path value gr c s)
+                                                                                                                    | (value,index) <- values])
+    descend schema       path              rpath = bug $ "descend "++show (schema,path,rpath)
+
+    updateEnv path value gr c (args,seq) = 
+      case updateNthM (restrictProtoFCat path value) nr args of
+        Just args -> c value (args,seq)
+        Nothing   -> bug "conflict in updateEnv"
+
+-- | the argument should be a parameter type and then
+-- the function returns all possible values.
+getAllParamValues :: Type -> CnvMonad [Term]
+getAllParamValues ty = CM (\gr c -> c (err bug id (allParamValues gr ty)))
+
+mkRecord :: [(Label,CnvMonad (Schema Branch s c))] -> CnvMonad (Schema Branch s c)
+mkRecord xs = CM (\gr c -> foldl (\c (lbl,CM m) bs s -> c ((lbl,m gr (\v s -> Return v) s) : bs) s) (c . CRec) xs [])
+
+mkTable  :: Type -> [(Term ,CnvMonad (Schema Branch s c))] -> CnvMonad (Schema Branch s c)
+mkTable pt xs = CM (\gr c -> foldl (\c (trm,CM m) bs s -> c ((trm,m gr (\v s -> Return v) s) : bs) s) (c . CTbl pt) xs [])
+
+----------------------------------------------------------------------
+-- Term Schema
+--
+-- The term schema is a term-like structure, with records, tables,
+-- strings and parameters values, but in addition we could add
+-- annotations of arbitrary types
+
+-- | Term schema
+data Schema b s c
+  = CRec      [(Label,b (Schema b s c))]
+  | CTbl Type [(Term, b (Schema b s c))]
+  | CStr s
+  | CPar c
+--deriving Show -- doesn't work
+
+instance Show s => Show (Schema b s c) where
+  showsPrec _ sch =
+      case sch of
+        CRec r   -> showString "CRec " . shows (map fst r)
+        CTbl t _ -> showString "CTbl " . showsPrec 10 t . showString " _"
+        CStr s   -> showString "CStr " . showsPrec 10 s
+        CPar c   -> showString "CPar{}"
+
+-- | Path into a term or term schema
+data Path
+  = CProj Label Path
+  | CSel  Term  Path
+  | CNil
+  deriving (Eq,Show)
+
+-- | The ProtoFCat represents a linearization type as term schema.
+-- The annotations are as follows: the strings are annotated with
+-- their index in the PMCFG tuple, the parameters are annotated
+-- with their value both as term and as index.
+data ProtoFCat  = PFCat Ident Int (Schema Identity Int (Int,[(Term,Int)]))
+type Env        = (ProtoFCat, [ProtoFCat])
+
+protoFCat :: SourceGrammar -> Cat -> Type -> ProtoFCat
+protoFCat gr cat lincat =
+  case computeCatRange gr lincat of
+    ((_,f),schema) -> PFCat (snd cat) f schema
+
+getFIds :: ProtoFCat -> [FId]
+getFIds (PFCat _ _ schema) =
+  reverse (solutions (variants schema) ())
+  where
+    variants (CRec rs)         = fmap sum $ mapM (\(lbl,Identity t) -> variants t) rs
+    variants (CTbl _ cs)       = fmap sum $ mapM (\(trm,Identity t) -> variants t) cs
+    variants (CStr _)          = return 0
+    variants (CPar (m,values)) = do (value,index) <- member values
+                                    return (m*index)
+
+catFactor :: ProtoFCat -> Int
+catFactor (PFCat _ f _) = f
+
+computeCatRange gr lincat = compute (0,1) lincat
+  where
+    compute st (RecType  rs) = let (st',rs') = List.mapAccumL (\st (lbl,t) -> case lbl of
+                                                                                LVar _ -> let (st',t') = compute st t
+                                                                                          in (st ,(lbl,Identity t'))
+                                                                                _      -> let (st',t') = compute st t
+                                                                                          in (st',(lbl,Identity t'))) st rs
+                               in (st',CRec rs')
+    compute st (Table pt vt) = let vs        = err bug id (allParamValues gr pt)
+                                   (st',cs') = List.mapAccumL (\st v       -> let (st',vt') = compute st vt
+                                                                              in (st',(v,Identity vt'))) st vs
+                               in (st',CTbl pt cs')
+    compute st (Sort s)
+                   | s == cStr = let (index,m) = st
+                                 in ((index+1,m),CStr index)
+    compute st t               = let vs = err bug id (allParamValues gr t)
+                                     (index,m) = st
+                                 in ((index,m*length vs),CPar (m,zip vs [0..]))
+
+ppPath (CProj lbl path) = lbl <+> ppPath path
+ppPath (CSel  trm path) = ppU 5 trm   <+> ppPath path
+ppPath CNil             = empty
+
+reversePath path = rev CNil path
+  where
+    rev path0 CNil             = path0
+    rev path0 (CProj lbl path) = rev (CProj lbl path0) path
+    rev path0 (CSel  trm path) = rev (CSel  trm path0) path
+
+
+----------------------------------------------------------------------
+-- term conversion
+
+type Value a = Schema Branch a Term
+
+convertTerm :: Options -> Path -> Type -> Term -> CnvMonad (Value [Symbol])
+convertTerm opts sel ctype (Vr x)       = convertArg opts ctype (getVarIndex x) (reversePath sel)
+convertTerm opts sel ctype (Abs _ _ t)  = convertTerm opts sel ctype t                -- there are only top-level abstractions and we ignore them !!!
+convertTerm opts sel ctype (R record)   = convertRec opts sel ctype record
+convertTerm opts sel ctype (P term l)   = convertTerm opts (CProj l sel) ctype term
+convertTerm opts sel ctype (V pt ts)    = convertTbl opts sel ctype pt ts
+convertTerm opts sel ctype (S term p)   = do v <- evalTerm CNil p
+                                             convertTerm opts (CSel v sel) ctype term
+convertTerm opts sel ctype (FV vars)    = do term <- variants vars
+                                             convertTerm opts sel ctype term
+convertTerm opts sel ctype (C t1 t2)    = do v1 <- convertTerm opts sel ctype t1
+                                             v2 <- convertTerm opts sel ctype t2
+                                             return (CStr (concat [s | CStr s <- [v1,v2]]))
+convertTerm opts sel ctype (K t)        = return (CStr [SymKS t])
+convertTerm opts sel ctype Empty        = return (CStr [])
+convertTerm opts sel ctype (Alts s alts)= do CStr s <- convertTerm opts CNil ctype s
+                                             alts <- forM alts $ \(u,alt) -> do
+                                                            CStr u <- convertTerm opts CNil ctype u
+                                                            Strs ps <- unPatt alt
+                                                            ps     <- mapM (convertTerm opts CNil ctype) ps
+                                                            return (u,map unSym ps)
+                                             return (CStr [SymKP s alts])
+  where
+    unSym (CStr [])        = ""
+    unSym (CStr [SymKS t]) = t
+    unSym _                = ppbug $ hang ("invalid prefix in pre expression:") 4 (Alts s alts)
+
+    unPatt (EPatt p) = fmap Strs (getPatts p)
+    unPatt u         = return u
+
+    getPatts p = case p of
+      PAlt a b  -> liftM2 (++) (getPatts a) (getPatts b)
+      PString s -> return [K s]
+      PSeq a b  -> do
+        as <- getPatts a
+        bs <- getPatts b
+        return [K (s ++ t) | K s <- as, K t <- bs]
+      _ -> fail (render ("not valid pattern in pre expression" <+> ppPatt Unqualified 0 p))
+
+convertTerm opts sel ctype (Q (m,f))
+  | m == cPredef &&
+    f == cBIND                          = return (CStr [SymBIND])
+  | m == cPredef &&
+    f == cSOFT_BIND                     = return (CStr [SymSOFT_BIND])
+  | m == cPredef &&
+    f == cSOFT_SPACE                    = return (CStr [SymSOFT_SPACE])
+  | m == cPredef &&
+    f == cCAPIT                         = return (CStr [SymCAPIT])
+  | m == cPredef &&
+    f == cALL_CAPIT                     = return (CStr [SymALL_CAPIT])
+  | m == cPredef &&
+    f == cNonExist                      = return (CStr [SymNE])
+{-
+convertTerm opts sel@(CProj l _) ctype (ExtR t1 t2@(R rs2))
+                    | l `elem` map fst rs2 = convertTerm opts sel ctype t2
+                    | otherwise            = convertTerm opts sel ctype t1
+
+convertTerm opts sel@(CProj l _) ctype (ExtR t1@(R rs1) t2)
+                    | l `elem` map fst rs1 = convertTerm opts sel ctype t1
+                    | otherwise            = convertTerm opts sel ctype t2
+-}
+convertTerm opts CNil ctype t           = do v <- evalTerm CNil t
+                                             return (CPar v)
+convertTerm _    sel  _     t           = ppbug ("convertTerm" <+> sep [parens (show sel),ppU 10 t])
+
+convertArg :: Options -> Term -> Int -> Path -> CnvMonad (Value [Symbol])
+convertArg opts (RecType rs)  nr path =
+  mkRecord (map (\(lbl,ctype) -> (lbl,convertArg opts ctype nr (CProj lbl path))) rs)
+convertArg opts (Table pt vt) nr path = do
+  vs <- getAllParamValues pt
+  mkTable pt (map (\v -> (v,convertArg opts vt nr (CSel v path))) vs)
+convertArg opts (Sort _)      nr path = do
+  (args,_) <- get
+  let PFCat cat _ schema = args !! nr
+      l = index (reversePath path) schema
+      sym | CProj (LVar i) CNil <- path = SymVar nr i
+          | isLiteralCat opts cat       = SymLit nr l
+          | otherwise                   = SymCat nr l
+  return (CStr [sym])
+  where
+    index (CProj lbl path) (CRec   rs) = case lookup lbl rs of
+                                           Just (Identity t) -> index path t
+    index (CSel  trm path) (CTbl _ rs) = case lookup trm rs of
+                                           Just (Identity t) -> index path t
+    index CNil             (CStr idx)  = idx
+convertArg opts ty nr path              = do
+  value <- choices nr (reversePath path)
+  return (CPar value)
+
+convertRec opts CNil (RecType rs) record =
+    mkRecord [(lbl,convertTerm opts CNil ctype (proj lbl))|(lbl,ctype)<-rs]
+  where proj lbl = if isLockLabel lbl then R [] else projectRec lbl record
+convertRec opts (CProj lbl path) ctype record =
+  convertTerm opts path ctype (projectRec lbl record)
+convertRec opts _ ctype _ = bug ("convertRec: "++show ctype)
+
+convertTbl opts CNil (Table _ vt) pt ts = do
+  vs <- getAllParamValues pt
+  mkTable pt (zipWith (\v t -> (v,convertTerm opts CNil vt t)) vs ts)
+convertTbl opts (CSel v sub_sel) ctype pt ts = do
+  vs <- getAllParamValues pt
+  case lookup v (zip vs ts) of
+    Just t  -> convertTerm opts sub_sel ctype t
+    Nothing -> ppbug ( "convertTbl:" <+> ("missing value" <+> v $$
+                                          "among" <+> vcat vs))
+convertTbl opts _ ctype _ _ = bug ("convertTbl: "++show ctype)
+
+
+goB :: Branch (Value SeqId) -> Path -> [SeqId] -> BacktrackM Env [SeqId]
+goB (Case nr path bs) rpath ss = do (value,b) <- member bs
+                                    restrictArg nr path value
+                                    goB b rpath ss
+goB (Variant bs)      rpath ss = do b <- member bs
+                                    goB b rpath ss
+goB (Return  v)       rpath ss = goV v rpath ss
+
+goV :: Value SeqId -> Path -> [SeqId] -> BacktrackM Env [SeqId]
+goV (CRec xs)    rpath ss = foldM (\ss (lbl,b) -> goB b (CProj lbl rpath) ss) ss (reverse xs)
+goV (CTbl _ xs)  rpath ss = foldM (\ss (trm,b) -> goB b (CSel  trm rpath) ss) ss (reverse xs)
+goV (CStr seqid) rpath ss = return (seqid : ss)
+goV (CPar t)     rpath ss = restrictHead (reversePath rpath) t >> return ss
+
+
+----------------------------------------------------------------------
+-- SeqSet
+
+type SeqSet   = Map.Map [Symbol] SeqId
+
+addSequencesB :: SeqSet -> Branch (Value [Symbol]) -> (SeqSet, Branch (Value SeqId))
+addSequencesB seqs (Case nr path bs) = let !(seqs1,bs1) = mapAccumL' (\seqs (trm,b) -> let !(seqs',b') = addSequencesB seqs b
+                                                                                       in (seqs',(trm,b'))) seqs bs
+                                       in (seqs1,Case nr path bs1)
+addSequencesB seqs (Variant bs)      = let !(seqs1,bs1) = mapAccumL' addSequencesB seqs bs
+                                       in (seqs1,Variant bs1)
+addSequencesB seqs (Return  v)       = let !(seqs1,v1) = addSequencesV seqs v
+                                       in (seqs1,Return v1)
+
+addSequencesV :: SeqSet -> Value [Symbol] -> (SeqSet, Value SeqId)
+addSequencesV seqs (CRec vs)  = let !(seqs1,vs1) = mapAccumL' (\seqs (lbl,b) -> let !(seqs',b') = addSequencesB seqs b
+                                                                                in (seqs',(lbl,b'))) seqs vs
+                                in (seqs1,CRec vs1)
+addSequencesV seqs (CTbl pt vs)=let !(seqs1,vs1) = mapAccumL' (\seqs (trm,b) -> let !(seqs',b') = addSequencesB seqs b
+                                                                                in (seqs',(trm,b'))) seqs vs
+                                in (seqs1,CTbl pt vs1)
+addSequencesV seqs (CStr lin) = let !(seqs1,seqid) = addSequence seqs lin
+                                in (seqs1,CStr seqid)
+addSequencesV seqs (CPar i)   = (seqs,CPar i)
+
+-- a strict version of Data.List.mapAccumL
+mapAccumL' f s []     = (s,[])
+mapAccumL' f s (x:xs) = (s'',y:ys)
+                        where !(s', y ) = f s x
+                              !(s'',ys) = mapAccumL' f s' xs
+
+addSequence :: SeqSet -> [Symbol] -> (SeqSet,SeqId)
+addSequence seqs seq =
+  case Map.lookup seq seqs of
+    Just id -> (seqs,id)
+    Nothing -> let !last_seq = Map.size seqs
+               in (Map.insert seq last_seq seqs, last_seq)
+
+
+------------------------------------------------------------
+-- eval a term to ground terms
+
+evalTerm :: Path -> Term -> CnvMonad Term
+evalTerm CNil (QC f)       = return (QC f)
+evalTerm CNil (App x y)    = do x <- evalTerm CNil x
+                                y <- evalTerm CNil y
+                                return (App x y)
+evalTerm path (Vr x)       = choices (getVarIndex x) path
+evalTerm path (R rs)       =
+    case path of
+      CProj lbl path -> evalTerm path (projectRec lbl rs)
+      CNil           -> R `fmap` mapM (\(lbl,(_,t)) -> assign lbl `fmap` evalTerm path t) rs
+evalTerm path (P term lbl) = evalTerm (CProj lbl path) term
+evalTerm path (V pt ts)    =
+   case path of
+     CNil          -> V pt `fmap` mapM (evalTerm path) ts
+     CSel trm path ->
+         do vs <- getAllParamValues pt
+            case lookup trm (zip vs ts) of
+              Just t  -> evalTerm path t
+              Nothing -> ppbug $ "evalTerm: missing value:"<+>trm
+                                 $$ "among:" <+>fsep (map (ppU 10) vs)
+evalTerm path (S term sel) = do v <- evalTerm CNil sel
+                                evalTerm (CSel v path) term
+evalTerm path (FV terms)   = variants terms >>= evalTerm path
+evalTerm path (EInt n)     = return (EInt n)
+evalTerm path t            = ppbug ("evalTerm" <+> parens t)
+--evalTerm path t            = ppbug (text "evalTerm" <+> sep [parens (text (show path)),parens (text (show t))])
+
+getVarIndex x = maybe err id $ getArgIndex x
+  where err = bug ("getVarIndex "++show x)
+
+----------------------------------------------------------------------
+-- GrammarEnv
+
+data PMCFGEnv = PMCFGEnv !ProdSet !FunSet
+type ProdSet  = Set.Set Production
+type FunSet   = Map.Map (UArray LIndex SeqId) FunId
+
+emptyPMCFGEnv =
+  PMCFGEnv Set.empty Map.empty
+
+addFunction :: PMCFGEnv -> FId -> UArray LIndex SeqId -> [[FId]] -> PMCFGEnv
+addFunction (PMCFGEnv prodSet funSet) !fid fun args =
+  case Map.lookup fun funSet of
+    Just !funid -> PMCFGEnv (Set.insert (Production fid funid args) prodSet)
+                            funSet
+    Nothing     -> let !funid = Map.size funSet
+                   in PMCFGEnv (Set.insert (Production fid funid args) prodSet)
+                               (Map.insert fun funid funSet)
+
+getPMCFG :: PMCFGEnv -> PMCFG
+getPMCFG (PMCFGEnv prodSet funSet) =
+  PMCFG (optimize prodSet) (mkSetArray funSet)
+  where
+    optimize ps = Map.foldrWithKey ff [] (Map.fromListWith (++) [((fid,funid),[args]) | (Production fid funid args) <- Set.toList ps])
+      where
+        ff :: (FId,FunId) -> [[[FId]]] -> [Production] -> [Production]
+        ff (fid,funid) xs prods
+          | product (map IntSet.size ys) == count
+                      = (Production fid funid (map IntSet.toList ys)) : prods
+          | otherwise = map (Production fid funid) xs ++ prods
+          where
+            count = sum (map (product . map length) xs)
+            ys    = foldl (zipWith (foldr IntSet.insert)) (repeat IntSet.empty) xs
+
+------------------------------------------------------------
+-- updating the MCF rule
+
+restrictArg :: LIndex -> Path -> Term -> BacktrackM Env ()
+restrictArg nr path index = do
+  (head, args) <- get
+  args <- updateNthM (restrictProtoFCat path index) nr args
+  put (head, args)
+
+restrictHead :: Path -> Term -> BacktrackM Env ()
+restrictHead path term = do
+  (head, args) <- get
+  head <- restrictProtoFCat path term head
+  put (head, args)
+
+restrictProtoFCat :: (Functor m, MonadPlus m) => Path -> Term -> ProtoFCat -> m ProtoFCat
+restrictProtoFCat path v (PFCat cat f schema) = do
+  schema <- addConstraint path v schema
+  return (PFCat cat f schema)
+  where
+    addConstraint (CProj lbl path) v (CRec rs)     = fmap CRec      $ update lbl (addConstraint path v) rs
+    addConstraint (CSel  trm path) v (CTbl pt cs)  = fmap (CTbl pt) $ update trm (addConstraint path v) cs
+    addConstraint CNil             v (CPar (m,vs)) = case lookup v vs of
+                                                       Just index -> return (CPar (m,[(v,index)]))
+                                                       Nothing    -> mzero
+    addConstraint CNil             v (CStr _)      = bug "restrictProtoFCat: string path"
+    
+    update k0 f [] = return []
+    update k0 f (x@(k,Identity v):xs)
+      | k0 == k    = do v <- f v
+                        return ((k,Identity v):xs)
+      | otherwise  = do xs <- update k0 f xs
+                        return (x:xs)
+
+mkArray    lst = listArray (0,length lst-1) lst
+mkSetArray map = array (0,Map.size map-1) [(v,k) | (k,v) <- Map.toList map]
+
+bug msg = ppbug msg
+ppbug msg = error . render $ hang "Internal error in GeneratePMCFG:" 4 msg
+
+ppU = ppTerm Unqualified

src/compiler/GF/Compile/GrammarToCanonical.hs

@@ -0,0 +1,389 @@
+-- | 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 PGF2.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 Empty = [""]  -- Empty == K ""
+        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 ImplicitParams, BangPatterns, FlexibleContexts, MagicHash #-}
 module GF.Compile.GrammarToPGF (grammar2PGF) where
 
 import GF.Compile.GeneratePMCFG
@@ -6,7 +6,7 @@ import GF.Compile.GenerateBC
 import GF.Compile.OptimizePGF
 
 import PGF2 hiding (mkType)
-import PGF2.Transactions
+import PGF2.Internal
 import GF.Grammar.Predef
 import GF.Grammar.Grammar hiding (Production)
 import qualified GF.Grammar.Lookup as Look
@@ -18,125 +18,113 @@ import GF.Infra.Option
 import GF.Infra.UseIO (IOE)
 import GF.Data.Operations
 
-import Control.Monad(forM_,foldM)
 import Data.List
 import Data.Char
 import qualified Data.Set as Set
 import qualified Data.Map as Map
 import qualified Data.IntMap as IntMap
-import qualified Data.Sequence as Seq
 import Data.Array.IArray
 import Data.Maybe(fromMaybe)
-import System.FilePath
-import System.Directory
 
-grammar2PGF :: Options -> Maybe PGF -> SourceGrammar -> ModuleName -> Map.Map PGF2.Fun Double -> IO PGF
-grammar2PGF opts mb_pgf gr am probs = do
-  let abs_name = mi2i am
-  pgf <- case mb_pgf of
-           Just pgf | abstractName pgf == abs_name   ->
-                         do return pgf
-           _        | snd (flag optLinkTargets opts) ->
-                         do let fname = maybe id (</>)
-                                              (flag optOutputDir opts)
-                                              (fromMaybe abs_name (flag optName opts)<.>"ngf")
-                            exists <- doesFileExist fname
-                            if exists
-                              then removeFile fname
-                              else return ()
-                            putStr ("(Boot image "++fname++") ")
-                            newNGF abs_name (Just fname) 0
-                    | otherwise ->
-                         do newNGF abs_name Nothing 0
+import GHC.Prim
+import GHC.Base(getTag)
 
-  pgf <- modifyPGF pgf $ do
-    sequence_ [setAbstractFlag name value | (name,value) <- optionsPGF aflags]
-    sequence_ [createCategory c ctxt p | (c,ctxt,p) <- cats]
-    sequence_ [createFunction f ty arity bcode p | (f,ty,arity,bcode,p) <- funs]
-    forM_ (allConcretes gr am) $ \cm ->
-      createConcrete (mi2i cm) $ do
-        let cflags = err (const noOptions) mflags (lookupModule gr cm)
-        sequence_ [setConcreteFlag name value | (name,value) <- optionsPGF cflags]
-        let infos = ( Seq.fromList [Left [SymCat 0 (LParam 0 [])]]
-                    , let id_prod = Production [] [PArg [] (LParam 0 [])] (LParam 0 []) [0]
-                          prods   = ([id_prod],[id_prod])
-                      in [(cInt,   CncCat (Just (noLoc GM.defLinType)) Nothing Nothing Nothing (Just prods))
-                         ,(cString,CncCat (Just (noLoc GM.defLinType)) Nothing Nothing Nothing (Just prods))
-                         ,(cFloat, CncCat (Just (noLoc GM.defLinType)) Nothing Nothing Nothing (Just prods))
-                         ]
-                    )
-                    : prepareSeqTbls (Look.allOrigInfos gr cm)
-        infos <- processInfos createCncCats infos
-        infos <- processInfos createCncFuns infos
-        return ()
-  return pgf
+grammar2PGF :: Options -> SourceGrammar -> ModuleName -> Map.Map PGF2.Fun Double -> IO PGF
+grammar2PGF opts gr am probs = do
+  cnc_infos <- getConcreteInfos gr am
+  return $
+    build (let gflags   = if flag optSplitPGF opts 
+                            then [("split", LStr "true")]
+                            else []
+               (an,abs) = mkAbstr am probs
+               cncs     = map (mkConcr opts abs) cnc_infos
+           in newPGF gflags an abs cncs)
   where
+    cenv = resourceValues opts gr
     aflags = err (const noOptions) mflags (lookupModule gr am)
 
-    adefs =
-        [((cPredefAbs,c), AbsCat (Just (L NoLoc []))) | c <- [cFloat,cInt,cString]] ++ 
-        Look.allOrigInfos gr am
-
-    toLogProb = realToFrac . negate . log
-
-    cats = [(c', snd (mkContext [] cont), toLogProb (fromMaybe 0 (Map.lookup c' probs))) |
-                               ((m,c),AbsCat (Just (L _ cont))) <- adefs, let c' = i2i c]
-
-    funs = [(f', mkType [] ty, arity, bcode, toLogProb (fromMaybe 0 (Map.lookup f' funs_probs))) |
-                               ((m,f),AbsFun (Just (L _ ty)) ma mdef _) <- adefs,
-                               let arity = mkArity ma mdef ty,
-                               let bcode = mkDef gr arity mdef,
-                               let f' = i2i f]
-                               
-    funs_probs = (Map.fromList . concat . Map.elems . fmap pad . Map.fromListWith (++))
-                    [(i2i cat,[(i2i f,Map.lookup f' probs)]) | ((m,f),AbsFun (Just (L _ ty)) _ _ _) <- adefs,
-                                                               let (_,(_,cat),_) = GM.typeForm ty,
-                                                               let f' = i2i f]
+    mkAbstr :: (?builder :: Builder s) => ModuleName -> Map.Map PGF2.Fun Double -> (AbsName, B s AbstrInfo)
+    mkAbstr am probs = (mi2i am, newAbstr flags cats funs)
       where
-        pad :: [(a,Maybe Double)] -> [(a,Double)]
-        pad pfs = [(f,fromMaybe deflt mb_p) | (f,mb_p) <- pfs]
+        adefs =
+            [((cPredefAbs,c), AbsCat (Just (L NoLoc []))) | c <- [cFloat,cInt,cString]] ++ 
+            Look.allOrigInfos gr am
+
+        flags = optionsPGF aflags
+
+        toLogProb = realToFrac . negate . log
+
+        cats = [(c', snd (mkContext [] cont), toLogProb (fromMaybe 0 (Map.lookup c' probs))) |
+                                   ((m,c),AbsCat (Just (L _ cont))) <- adefs, let c' = i2i c]
+
+        funs = [(f', mkType [] ty, arity, bcode, toLogProb (fromMaybe 0 (Map.lookup f' funs_probs))) |
+                                   ((m,f),AbsFun (Just (L _ ty)) ma mdef _) <- adefs,
+                                   let arity = mkArity ma mdef ty,
+                                   let bcode = mkDef gr arity mdef,
+                                   let f' = i2i f]
+                                   
+        funs_probs = (Map.fromList . concat . Map.elems . fmap pad . Map.fromListWith (++))
+                        [(i2i cat,[(i2i f,Map.lookup f' probs)]) | ((m,f),AbsFun (Just (L _ ty)) _ _ _) <- adefs,
+                                                                   let (_,(_,cat),_) = GM.typeForm ty,
+                                                                   let f' = i2i f]
           where
-            deflt = case length [f | (f,Nothing) <- pfs] of
-                      0 -> 0
-                      n -> max 0 ((1 - sum [d | (f,Just d) <- pfs]) / fromIntegral n)
+            pad :: [(a,Maybe Double)] -> [(a,Double)]
+            pad pfs = [(f,fromMaybe deflt mb_p) | (f,mb_p) <- pfs]
+              where
+                deflt = case length [f | (f,Nothing) <- pfs] of
+                          0 -> 0
+                          n -> max 0 ((1 - sum [d | (f,Just d) <- pfs]) / fromIntegral n)
 
-    prepareSeqTbls infos = 
-       (map addSeqTable . Map.toList . Map.fromListWith (++))
-               [(m,[(c,info)]) | ((m,c),info) <- infos]
-       where
-         addSeqTable (m,infos) = 
-           case lookupModule gr m of
-             Ok mi   -> case mseqs mi of
-                          Just seqs -> (fmap Left seqs,infos)
-                          Nothing   -> (Seq.empty,[])
-             Bad msg -> error msg
+    mkConcr opts abs (cm,ex_seqs,cdefs) =
+      let cflags = err (const noOptions) mflags (lookupModule gr cm)
+          ciCmp | flag optCaseSensitive cflags = compare
+                | otherwise                    = compareCaseInsensitive
 
-    processInfos f []                    = return []
-    processInfos f ((seqtbl,infos):rest) = do
-      seqtbl <- foldM f seqtbl infos
-      rest <- processInfos f rest
-      return ((seqtbl,infos):rest)
+          flags = optionsPGF aflags
 
-    createCncCats seqtbl (c,CncCat (Just (L _ ty)) _ _ mprn (Just (lindefs,linrefs))) = do
-      seqtbl <- createLincat (i2i c) (type2fields gr ty) lindefs linrefs seqtbl
-      case mprn of
-        Nothing        -> return ()
-        Just (L _ prn) -> setPrintName (i2i c) (unwords (term2tokens prn))
-      return seqtbl
-    createCncCats seqtbl _ = return seqtbl
+          seqs = (mkSetArray . Set.fromList . concat) $
+                       (elems (ex_seqs :: Array SeqId [Symbol]) : [maybe [] elems (mseqs mi) | (m,mi) <- allExtends gr cm])
 
-    createCncFuns seqtbl (f,CncFun _ _ mprn (Just prods)) = do
-      seqtbl <- createLin (i2i f) prods seqtbl
-      case mprn of
-        Nothing        -> return ()
-        Just (L _ prn) -> setPrintName (i2i f) (unwords (term2tokens prn))
-      return seqtbl
-    createCncFuns seqtbl _ = return seqtbl
+          !(!fid_cnt1,!cnccats) = genCncCats gr am cm cdefs
+          cnccat_ranges = Map.fromList (map (\(cid,s,e,_) -> (cid,(s,e))) cnccats)
+          !(!fid_cnt2,!productions,!lindefs,!linrefs,!cncfuns)
+                                = genCncFuns gr am cm ex_seqs ciCmp seqs cdefs fid_cnt1 cnccat_ranges
 
-    term2tokens (K tok)     = [tok]
-    term2tokens (C t1 t2)   = term2tokens t1 ++ term2tokens t2
-    term2tokens (Typed t _) = term2tokens t
-    term2tokens _           = []
+          printnames = genPrintNames cdefs
+
+          startCat = (fromMaybe "S" (flag optStartCat aflags))
+
+          (lindefs',linrefs',productions',cncfuns',sequences',cnccats') =
+               (if flag optOptimizePGF opts then optimizePGF startCat else id)
+                    (lindefs,linrefs,productions,cncfuns,elems seqs,cnccats)
+
+      in (mi2i cm, newConcr abs
+                            flags
+                            printnames
+                            lindefs'
+                            linrefs'
+                            productions'
+                            cncfuns'
+                            sequences'
+                            cnccats'
+                            fid_cnt2)
+
+    getConcreteInfos gr am = mapM flatten (allConcretes gr am)
+      where
+        flatten cm = do
+          (seqs,infos) <- addMissingPMCFGs cm Map.empty
+                                           (lit_infos ++ Look.allOrigInfos gr cm)
+          return (cm,mkMapArray seqs :: Array SeqId [Symbol],infos)
+
+        lit_infos = [((cPredefAbs,c), CncCat (Just (L NoLoc GM.defLinType)) Nothing Nothing Nothing Nothing) | c <- [cInt,cFloat,cString]]
+
+        -- if some module was compiled with -no-pmcfg, then
+        -- we have to create the PMCFG code just before linking
+        addMissingPMCFGs cm seqs []                  = return (seqs,[])
+        addMissingPMCFGs cm seqs (((m,id), info):is) = do
+          (seqs,info)  <- addPMCFG opts gr cenv Nothing am cm seqs id info
+          (seqs,infos) <- addMissingPMCFGs cm seqs is
+          return (seqs, ((m,id), info) : infos)
 
 i2i :: Ident -> String
 i2i = showIdent
@@ -144,27 +132,27 @@ i2i = showIdent
 mi2i :: ModuleName -> String
 mi2i (MN i) = i2i i
 
-mkType :: [Ident] -> A.Type -> PGF2.Type
+mkType :: (?builder :: Builder s) => [Ident] -> A.Type -> B s PGF2.Type
 mkType scope t =
   case GM.typeForm t of
     (hyps,(_,cat),args) -> let (scope',hyps') = mkContext scope hyps
-                           in DTyp hyps' (i2i cat) (map (mkExp scope') args)
+                           in dTyp hyps' (i2i cat) (map (mkExp scope') args)
 
-mkExp :: [Ident] -> A.Term -> Expr
+mkExp :: (?builder :: Builder s) => [Ident] -> A.Term -> B s Expr
 mkExp scope t =
   case t of
-    Q (_,c)  -> EFun (i2i c)
-    QC (_,c) -> EFun (i2i c)
+    Q (_,c)  -> eFun (i2i c)
+    QC (_,c) -> eFun (i2i c)
     Vr x     -> case lookup x (zip scope [0..]) of
-                  Just i  -> EVar  i
-                  Nothing -> EMeta 0
-    Abs b x t-> EAbs b (i2i x) (mkExp (x:scope) t)
-    App t1 t2-> EApp (mkExp scope t1) (mkExp scope t2)
-    EInt i   -> ELit (LInt (fromIntegral i))
-    EFloat f -> ELit (LFlt f)
-    K s      -> ELit (LStr s)
-    Meta i   -> EMeta i
-    _        -> EMeta 0
+                  Just i  -> eVar  i
+                  Nothing -> eMeta 0
+    Abs b x t-> eAbs b (i2i x) (mkExp (x:scope) t)
+    App t1 t2-> eApp (mkExp scope t1) (mkExp scope t2)
+    EInt i   -> eLit (LInt (fromIntegral i))
+    EFloat f -> eLit (LFlt f)
+    K s      -> eLit (LStr s)
+    Meta i   -> eMeta i
+    _        -> eMeta 0
 {-
 mkPatt scope p = 
   case p of
@@ -181,12 +169,11 @@ mkPatt scope p =
                    in (scope',C.PImplArg p')
     A.PTilde t  -> (  scope,C.PTilde (mkExp scope t))
 -}
-
-mkContext :: [Ident] -> A.Context -> ([Ident],[PGF2.Hypo])
+mkContext :: (?builder :: Builder s) => [Ident] -> A.Context -> ([Ident],[B s PGF2.Hypo])
 mkContext scope hyps = mapAccumL (\scope (bt,x,ty) -> let ty' = mkType scope ty
                                                       in if x == identW
-                                                           then (  scope,(bt,i2i x,ty'))
-                                                           else (x:scope,(bt,i2i x,ty'))) scope hyps 
+                                                           then (  scope,hypo bt (i2i x) ty')
+                                                           else (x:scope,hypo bt (i2i x) ty')) scope hyps 
 
 mkDef gr arity (Just eqs) = generateByteCode gr arity eqs
 mkDef gr arity Nothing    = []
@@ -195,7 +182,7 @@ mkArity (Just a) _        ty = a   -- known arity, i.e. defined function
 mkArity Nothing  (Just _) ty = 0   -- defined function with no arity - must be an axiom
 mkArity Nothing  _        ty = let (ctxt, _, _) = GM.typeForm ty  -- constructor
                                in length ctxt
-{-
+
 genCncCats gr am cm cdefs = mkCncCats 0 cdefs
   where
     mkCncCats index []                                                = (index,[])
@@ -458,4 +445,3 @@ compareCaseInsensitive (x:xs) (y:ys) =
                               EQ -> compare x y
                               x  -> x
                       x  -> x
--}

src/compiler/GF/Compile/Optimize.hs

@@ -0,0 +1,232 @@
+{-# LANGUAGE PatternGuards #-}
+----------------------------------------------------------------------
+-- |
+-- Module      : Optimize
+-- Maintainer  : AR
+-- Stability   : (stable)
+-- Portability : (portable)
+--
+-- > CVS $Date: 2005/09/16 13:56:13 $ 
+-- > CVS $Author: aarne $
+-- > CVS $Revision: 1.18 $
+--
+-- Top-level partial evaluation for GF source modules.
+-----------------------------------------------------------------------------
+
+module GF.Compile.Optimize (optimizeModule) where
+
+import GF.Grammar.Grammar
+import GF.Infra.Ident
+import GF.Grammar.Printer
+import GF.Grammar.Macros
+import GF.Grammar.Lookup
+import GF.Grammar.Predef
+import GF.Compile.Compute.ConcreteNew(GlobalEnv,normalForm,resourceValues)
+import GF.Data.Operations
+import GF.Infra.Option
+
+import Control.Monad
+import qualified Data.Set as Set
+import qualified Data.Map as Map
+import GF.Text.Pretty
+import Debug.Trace
+
+-- | partial evaluation of concrete syntax. AR 6\/2001 -- 16\/5\/2003 -- 5\/2\/2005.
+
+optimizeModule :: Options -> SourceGrammar -> SourceModule -> Err SourceModule
+optimizeModule opts sgr m@(name,mi)
+  | mstatus mi == MSComplete = do
+      ids <- topoSortJments m
+      mi <- foldM updateEvalInfo mi ids
+      return (name,mi)
+  | otherwise = return m
+ where
+   oopts = opts `addOptions` mflags mi
+
+   resenv = resourceValues oopts sgr
+
+   updateEvalInfo mi (i,info) = do
+     info <- evalInfo oopts resenv sgr (name,mi) i info
+     return (mi{jments=Map.insert i info (jments mi)})
+
+evalInfo :: Options -> GlobalEnv -> SourceGrammar -> SourceModule -> Ident -> Info -> Err Info
+evalInfo opts resenv sgr m c info = do
+
+ (if verbAtLeast opts Verbose then trace (" " ++ showIdent c) else id) return ()
+
+ errIn ("optimizing " ++ showIdent c) $ case info of
+
+  CncCat ptyp pde pre ppr mpmcfg -> do
+    pde' <- case (ptyp,pde) of
+      (Just (L _ typ), Just (L loc de)) -> do
+        de <- partEval opts gr ([(Explicit, varStr, typeStr)], typ) de
+        return (Just (L loc (factor param c 0 de)))
+      (Just (L loc typ), Nothing) -> do
+        de <- mkLinDefault gr typ
+        de <- partEval opts gr ([(Explicit, varStr, typeStr)], typ) de
+        return (Just (L loc (factor param c 0 de)))
+      _ -> return pde   -- indirection
+
+    pre' <- case (ptyp,pre) of
+      (Just (L _ typ), Just (L loc re)) -> do
+        re <- partEval opts gr ([(Explicit, varStr, typ)], typeStr) re
+        return (Just (L loc (factor param c 0 re)))
+      (Just (L loc typ), Nothing) -> do
+        re <- mkLinReference gr typ
+        re <- partEval opts gr ([(Explicit, varStr, typ)], typeStr) re
+        return (Just (L loc (factor param c 0 re)))
+      _ -> return pre   -- indirection
+
+    let ppr' = fmap (evalPrintname resenv c) ppr
+
+    return (CncCat ptyp pde' pre' ppr' mpmcfg)
+
+  CncFun (mt@(Just (_,cont,val))) pde ppr mpmcfg -> --trace (prt c) $
+       eIn ("linearization in type" <+> mkProd cont val [] $$ "of function") $ do
+    pde' <- case pde of
+      Just (L loc de) -> do de <- partEval opts gr (cont,val) de
+                            return (Just (L loc (factor param c 0 de)))
+      Nothing -> return pde
+    let ppr' = fmap (evalPrintname resenv c) ppr
+    return $ CncFun mt pde' ppr' mpmcfg -- only cat in type actually needed
+{-
+  ResOper pty pde 
+    | not new && OptExpand `Set.member` optim -> do
+         pde' <- case pde of
+                   Just (L loc de) -> do de <- computeConcrete gr de
+                                         return (Just (L loc (factor param c 0 de)))
+                   Nothing -> return Nothing
+         return $ ResOper pty pde'
+-}
+  _ ->  return info
+ where
+-- new = flag optNewComp opts -- computations moved to GF.Compile.GeneratePMCFG
+
+   gr = prependModule sgr m
+   optim = flag optOptimizations opts
+   param = OptParametrize `Set.member` optim
+   eIn cat = errIn (render ("Error optimizing" <+> cat <+> c <+> ':'))
+
+-- | the main function for compiling linearizations
+partEval :: Options -> SourceGrammar -> (Context,Type) -> Term -> Err Term
+partEval opts = {-if flag optNewComp opts
+                then-} partEvalNew opts
+                {-else partEvalOld opts-}
+
+partEvalNew opts gr (context, val) trm =
+    errIn (render ("partial evaluation" <+> ppTerm Qualified 0 trm)) $
+    checkPredefError trm
+{-
+partEvalOld opts gr (context, val) trm = errIn (render (text "partial evaluation" <+> ppTerm Qualified 0 trm)) $ do
+  let vars  = map (\(bt,x,t) -> x) context
+      args  = map Vr vars
+      subst = [(v, Vr v) | v <- vars]
+      trm1 = mkApp trm args
+  trm2 <- computeTerm gr subst trm1
+  trm3 <- if rightType trm2
+          then computeTerm gr subst trm2 -- compute twice??
+          else recordExpand val trm2 >>= computeTerm gr subst
+  trm4 <- checkPredefError trm3
+  return $ mkAbs [(Explicit,v) | v <- vars] trm4
+  where
+    -- don't eta expand records of right length (correct by type checking)
+    rightType (R rs) = case val of
+                         RecType ts -> length rs == length ts
+                         _          -> False
+    rightType _      = False
+
+
+-- here we must be careful not to reduce
+--   variants {{s = "Auto" ; g = N} ; {s = "Wagen" ; g = M}}
+--   {s  = variants {"Auto" ; "Wagen"} ; g  = variants {N ; M}} ;
+
+recordExpand :: Type -> Term -> Err Term
+recordExpand typ trm = case typ of
+  RecType tys -> case trm of
+    FV rs -> return $ FV [R [assign lab (P r lab) | (lab,_) <- tys] | r <- rs]
+    _ -> return $ R [assign lab (P trm lab) | (lab,_) <- tys]
+  _ -> return trm
+
+-}
+-- | auxiliaries for compiling the resource
+
+mkLinDefault :: SourceGrammar -> Type -> Err Term
+mkLinDefault gr typ = liftM (Abs Explicit varStr) $ mkDefField typ
+ where
+   mkDefField typ = case typ of
+     Table p t  -> do
+       t' <- mkDefField t
+       let T _ cs = mkWildCases t'
+       return $ T (TWild p) cs
+     Sort s | s == cStr -> return $ Vr varStr
+     QC p           -> do vs <- lookupParamValues gr p
+                          case vs of
+                            v:_ -> return v
+                            _   -> Bad (render ("no parameter values given to type" <+> ppQIdent Qualified p))
+     RecType r  -> do
+       let (ls,ts) = unzip r
+       ts <- mapM mkDefField ts
+       return $ R (zipWith assign ls ts)
+     _ | Just _ <- isTypeInts typ -> return $ EInt 0 -- exists in all as first val
+     _ -> Bad (render ("linearization type field cannot be" <+> typ))
+
+mkLinReference :: SourceGrammar -> Type -> Err Term
+mkLinReference gr typ = 
+ liftM (Abs Explicit varStr) $ 
+   case mkDefField typ (Vr varStr) of
+     Bad "no string" -> return Empty
+     x               -> x
+ where
+   mkDefField ty trm = 
+     case ty of
+       Table pty ty -> do ps <- allParamValues gr pty
+                          case ps of
+                            []     -> Bad "no string"
+                            (p:ps) -> mkDefField ty (S trm p)
+       Sort s | s == cStr -> return trm
+       QC p       -> Bad "no string"
+       RecType [] -> Bad "no string"
+       RecType rs -> do
+         msum (map (\(l,ty) -> mkDefField ty (P trm l)) (sortRec rs))
+           `mplus` Bad "no string"
+       _ | Just _ <- isTypeInts typ -> Bad "no string"
+       _ -> Bad (render ("linearization type field cannot be" <+> typ))
+
+evalPrintname :: GlobalEnv -> Ident -> L Term -> L Term
+evalPrintname resenv c (L loc pr) = L loc (normalForm resenv (L loc c) pr)
+
+-- do even more: factor parametric branches
+
+factor :: Bool -> Ident -> Int -> Term -> Term
+factor param c i t =
+  case t of
+    T (TComp ty) cs -> factors ty [(p, factor param c (i+1) v) | (p, v) <- cs]
+    _               -> composSafeOp (factor param c i) t
+  where
+    factors ty pvs0  
+                 | not param = V ty (map snd pvs0)
+    factors ty []            = V ty []
+    factors ty pvs0@[(p,v)]  = V ty [v]
+    factors ty pvs0@(pv:pvs) =
+      let t  = mkFun pv
+          ts = map mkFun pvs
+      in if all (==t) ts
+           then T (TTyped ty) (mkCases t)
+           else V ty (map snd pvs0)
+
+    --- we hope this will be fresh and don't check... in GFC would be safe
+    qvar = identS ("q_" ++ showIdent c ++ "__" ++ show i)
+
+    mkFun (patt, val) = replace (patt2term patt) (Vr qvar) val
+    mkCases t = [(PV qvar, t)]
+
+--  we need to replace subterms
+replace :: Term -> Term -> Term -> Term
+replace old new trm =
+  case trm of
+    -- these are the important cases, since they can correspond to patterns  
+    QC _     | trm == old -> new
+    App _ _  | trm == old -> new
+    R _      | trm == old -> new
+    App x y               -> App (replace old new x) (replace old new y)
+    _                     -> composSafeOp (replace old new) trm

src/compiler/GF/Compile/OptimizePGF.hs

@@ -2,7 +2,7 @@
 module GF.Compile.OptimizePGF(optimizePGF) where
 
 import PGF2(Cat,Fun)
-import PGF2.Transactions
+import PGF2.Internal
 import Data.Array.ST
 import Data.Array.Unboxed
 import qualified Data.Map as Map
@@ -12,16 +12,15 @@ import qualified Data.IntMap as IntMap
 import qualified Data.List as List
 import Control.Monad.ST
 
-type ConcrData = ()
-{-([(FId,[FunId])],          -- ^ Lindefs
+type ConcrData = ([(FId,[FunId])],          -- ^ Lindefs
                   [(FId,[FunId])],          -- ^ Linrefs
                   [(FId,[Production])],     -- ^ Productions
                   [(Fun,[SeqId])],          -- ^ Concrete functions   (must be sorted by Fun)
                   [[Symbol]],               -- ^ Sequences            (must be sorted)
                   [(Cat,FId,FId,[String])]) -- ^ Concrete categories
--}
+
 optimizePGF :: Cat -> ConcrData -> ConcrData
-optimizePGF startCat = error "TODO: optimizePGF" {- topDownFilter startCat . bottomUpFilter
+optimizePGF startCat = topDownFilter startCat . bottomUpFilter
 
 catString = "String"
 catInt    = "Int"
@@ -188,4 +187,3 @@ filterProductions prods0 hoc0 prods
 
     accumHOC hoc (PApply funid args) = List.foldl' (\hoc (PArg hypos _) -> List.foldl' (\hoc fid -> IntSet.insert fid hoc) hoc (map snd hypos)) hoc args
     accumHOC hoc _                   = hoc
--}

src/compiler/GF/Compile/PGFtoHaskell.hs

@@ -5,7 +5,7 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/06/17 12:39:07 $
+-- > CVS $Date: 2005/06/17 12:39:07 $ 
 -- > CVS $Author: bringert $
 -- > CVS $Revision: 1.8 $
 --
@@ -17,68 +17,60 @@
 module GF.Compile.PGFtoHaskell (grammar2haskell) where
 
 import PGF2
+import PGF2.Internal
 
 import GF.Data.Operations
 import GF.Infra.Option
 
-import Data.List(isPrefixOf,find,intercalate,intersperse,groupBy,sortBy)
+import Data.List
 import Data.Maybe(mapMaybe)
 import qualified Data.Map as Map
 
 type Prefix = String -> String
-type DerivingClause = String
 
 -- | the main function
 grammar2haskell :: Options
                 -> String  -- ^ Module name.
                 -> PGF
                 -> String
-grammar2haskell opts name gr = foldr (++++) [] $
-  pragmas ++ haskPreamble gadt name derivingClause (extraImports ++ pgfImports) ++
-  [types, gfinstances gId lexical gr'] ++ compos
+grammar2haskell opts name gr = foldr (++++) [] $  
+  pragmas ++ haskPreamble gadt name ++ [types, gfinstances gId lexical gr'] ++ compos
     where gr' = hSkeleton gr
           gadt = haskellOption opts HaskellGADT
-          dataExt = haskellOption opts HaskellData
           lexical cat = haskellOption opts HaskellLexical && isLexicalCat opts cat
-          gId | haskellOption opts HaskellNoPrefix = rmForbiddenChars
-              | otherwise = ("G"++) . rmForbiddenChars
-          -- GF grammars allow weird identifier names inside '', e.g. 'VP/Object'
-          rmForbiddenChars = filter (`notElem` "'!#$%&*+./<=>?@\\^|-~")
-          pragmas | gadt = ["{-# LANGUAGE GADTs, FlexibleInstances, KindSignatures, RankNTypes, TypeSynonymInstances #-}"]
-                  | dataExt = ["{-# LANGUAGE DeriveDataTypeable #-}"]
+          gId | haskellOption opts HaskellNoPrefix = id
+              | otherwise = ("G"++)
+          pragmas | gadt = ["{-# OPTIONS_GHC -fglasgow-exts #-}"]
                   | otherwise = []
-          derivingClause
-                 | dataExt = "deriving (Show,Data)"
-                 | otherwise = "deriving Show"
-          extraImports | gadt = ["import Control.Monad.Identity", "import Data.Monoid"]
-                       | dataExt = ["import Data.Data"]
-                       | otherwise = []
-          pgfImports = ["import PGF2", ""]
           types | gadt = datatypesGADT gId lexical gr'
-                | otherwise = datatypes gId derivingClause lexical gr'
+                | otherwise = datatypes gId lexical gr'
           compos | gadt = prCompos gId lexical gr' ++ composClass
                  | otherwise = []
 
-haskPreamble :: Bool -> String -> String -> [String] -> [String]
-haskPreamble gadt name derivingClause imports =
+haskPreamble gadt name =
  [
   "module " ++ name ++ " where",
   ""
- ] ++ imports ++ [
-  "",
+ ] ++
+ (if gadt then [
+  "import Control.Monad.Identity",
+  "import Data.Monoid"
+  ] else []) ++
+ [
+  "import PGF hiding (Tree)",
   "----------------------------------------------------",
   "-- automatic translation from GF to Haskell",
   "----------------------------------------------------",
-  "",
+  "", 
   "class Gf a where",
   "  gf :: a -> Expr",
   "  fg :: Expr -> a",
   "",
-  predefInst gadt derivingClause "GString" "String"  "unStr"    "mkStr",
+  predefInst gadt "GString" "String"  "unStr"    "mkStr",
   "",
-  predefInst gadt derivingClause "GInt"    "Integer"     "unInt"    "mkInt",
+  predefInst gadt "GInt"    "Int"     "unInt"    "mkInt",
   "",
-  predefInst gadt derivingClause "GFloat"  "Double"  "unFloat"  "mkFloat",
+  predefInst gadt "GFloat"  "Double"  "unFloat"  "mkFloat",
   "",
   "----------------------------------------------------",
   "-- below this line machine-generated",
@@ -86,12 +78,11 @@ haskPreamble gadt name derivingClause imports =
   ""
  ]
 
-predefInst :: Bool -> String -> String -> String -> String -> String -> String
-predefInst gadt derivingClause gtyp typ destr consr =
+predefInst gadt gtyp typ destr consr = 
   (if gadt
-    then []
-    else "newtype" +++ gtyp +++ "=" +++ gtyp +++ typ +++ derivingClause ++ "\n\n"
-    )
+    then [] 
+    else ("newtype" +++ gtyp +++ "=" +++ gtyp +++ typ +++ " deriving Show\n\n") 
+    ) 
   ++
   "instance Gf" +++ gtyp +++ "where" ++++
   "  gf (" ++ gtyp +++ "x) =" +++ consr +++ "x" ++++
@@ -104,24 +95,24 @@ type OIdent = String
 
 type HSkeleton = [(OIdent, [(OIdent, [OIdent])])]
 
-datatypes :: Prefix -> DerivingClause -> (OIdent -> Bool) -> (String,HSkeleton) -> String
-datatypes gId derivingClause lexical = foldr (+++++) "" . filter (/="") . map (hDatatype gId derivingClause lexical) . snd
+datatypes :: Prefix -> (OIdent -> Bool) -> (String,HSkeleton) -> String
+datatypes gId lexical = (foldr (+++++) "") . (filter (/="")) . (map (hDatatype gId lexical)) . snd
 
 gfinstances :: Prefix -> (OIdent -> Bool) -> (String,HSkeleton) -> String
-gfinstances gId lexical (m,g) = foldr (+++++) "" $ filter (/="") $ map (gfInstance gId lexical m) g
+gfinstances gId lexical (m,g) = (foldr (+++++) "") $ (filter (/="")) $ (map (gfInstance gId lexical m)) g
 
 
-hDatatype  :: Prefix -> DerivingClause -> (OIdent -> Bool) -> (OIdent, [(OIdent, [OIdent])]) -> String
-hDatatype _ _ _ ("Cn",_) = "" ---
-hDatatype gId _ _ (cat,[]) = "data" +++ gId cat
-hDatatype gId derivingClause _ (cat,rules) | isListCat (cat,rules) =
- "newtype" +++ gId cat +++ "=" +++ gId cat +++ "[" ++ gId (elemCat cat) ++ "]"
-  +++ derivingClause
-hDatatype gId derivingClause lexical (cat,rules) =
+hDatatype  :: Prefix -> (OIdent -> Bool) -> (OIdent, [(OIdent, [OIdent])]) -> String
+hDatatype _ _ ("Cn",_) = "" ---
+hDatatype gId _ (cat,[]) = "data" +++ gId cat
+hDatatype gId _ (cat,rules) | isListCat (cat,rules) = 
+ "newtype" +++ gId cat +++ "=" +++ gId cat +++ "[" ++ gId (elemCat cat) ++ "]" 
+  +++ "deriving Show"
+hDatatype gId lexical (cat,rules) =
  "data" +++ gId cat +++ "=" ++
  (if length rules == 1 then "" else "\n  ") +++
  foldr1 (\x y -> x ++ "\n |" +++ y) constructors ++++
- " " +++ derivingClause
+ "  deriving Show"
   where
     constructors = [gId f +++ foldr (+++) "" (map (gId) xx) | (f,xx) <- nonLexicalRules (lexical cat) rules]
                    ++ if lexical cat then [lexicalConstructor cat +++ "String"] else []
@@ -133,17 +124,16 @@ nonLexicalRules True rules = [r | r@(f,t) <- rules, not (null t)]
 lexicalConstructor :: OIdent -> String
 lexicalConstructor cat = "Lex" ++ cat
 
-predefTypeSkel :: HSkeleton
 predefTypeSkel = [(c,[]) | c <- ["String", "Int", "Float"]]
 
 -- GADT version of data types
 datatypesGADT :: Prefix -> (OIdent -> Bool) -> (String,HSkeleton) -> String
-datatypesGADT gId lexical (_,skel) = unlines $
+datatypesGADT gId lexical (_,skel) = unlines $ 
     concatMap (hCatTypeGADT gId) (skel ++ predefTypeSkel) ++
-    [
-      "",
+    [ 
+      "", 
       "data Tree :: * -> * where"
-    ] ++
+    ] ++ 
     concatMap (map ("  "++) . hDatatypeGADT gId lexical) skel ++
     [
       "  GString :: String -> Tree GString_",
@@ -167,23 +157,23 @@ hCatTypeGADT gId (cat,rules)
        "data"+++gId cat++"_"]
 
 hDatatypeGADT :: Prefix -> (OIdent -> Bool) -> (OIdent, [(OIdent, [OIdent])]) -> [String]
-hDatatypeGADT gId lexical (cat, rules)
+hDatatypeGADT gId lexical (cat, rules) 
     | isListCat (cat,rules) = [gId cat+++"::"+++"["++gId (elemCat cat)++"]" +++ "->" +++ t]
     | otherwise =
-        [ gId f +++ "::" +++ concatMap (\a -> gId a +++ "-> ") args ++ t
+        [ gId f +++ "::" +++ concatMap (\a -> gId a +++ "-> ") args ++ t 
           | (f,args) <- nonLexicalRules (lexical cat) rules ]
         ++ if lexical cat then [lexicalConstructor cat +++ ":: String ->"+++ t] else []
   where t = "Tree" +++ gId cat ++ "_"
 
 hEqGADT :: Prefix -> (OIdent -> Bool) -> (OIdent, [(OIdent, [OIdent])]) -> [String]
 hEqGADT gId lexical (cat, rules)
-  | isListCat (cat,rules) = let r = listr cat in ["(" ++ patt "x" r ++ "," ++ patt "y" r ++ ") -> " ++ listeqs]
+  | isListCat (cat,rules) = let r = listr cat in ["(" ++ patt "x" r ++ "," ++ patt "y" r ++ ") -> " ++ listeqs] 
   | otherwise = ["(" ++ patt "x" r ++ "," ++ patt "y" r ++ ") -> " ++ eqs r | r <- nonLexicalRules (lexical cat) rules]
           ++ if lexical cat then ["(" ++ lexicalConstructor cat +++ "x" ++ "," ++ lexicalConstructor cat +++ "y" ++ ") -> x == y"] else []
 
  where
    patt s (f,xs) = unwords (gId f : mkSVars s (length xs))
-   eqs (_,xs) = unwords ("and" : "[" : intersperse "," [x ++ " == " ++ y |
+   eqs (_,xs) = unwords ("and" : "[" : intersperse "," [x ++ " == " ++ y | 
      (x,y) <- zip (mkSVars "x" (length xs)) (mkSVars "y" (length xs)) ] ++ ["]"])
    listr c = (c,["foo"]) -- foo just for length = 1
    listeqs = "and [x == y | (x,y) <- zip x1 y1]"
@@ -192,26 +182,25 @@ prCompos :: Prefix -> (OIdent -> Bool) -> (String,HSkeleton) -> [String]
 prCompos gId lexical (_,catrules) =
     ["instance Compos Tree where",
      "  compos r a f t = case t of"]
-    ++
+    ++ 
     ["    " ++ prComposCons (gId f) xs | (c,rs) <- catrules, not (isListCat (c,rs)),
-                                         (f,xs) <- rs, not (null xs)]
-    ++
+                                         (f,xs) <- rs, not (null xs)] 
+    ++ 
     ["    " ++ prComposCons (gId c) ["x1"] | (c,rs) <- catrules, isListCat (c,rs)]
-    ++
+    ++ 
     ["    _ -> r t"]
   where
-    prComposCons f xs = let vs = mkVars (length xs) in
+    prComposCons f xs = let vs = mkVars (length xs) in 
                         f +++ unwords vs +++ "->" +++ rhs f (zip vs xs)
     rhs f vcs = "r" +++ f +++ unwords (map (prRec f) vcs)
-    prRec f (v,c)
+    prRec f (v,c) 
       | isList f  = "`a` foldr (a . a (r (:)) . f) (r [])" +++ v
       | otherwise = "`a`" +++ "f" +++ v
-    isList f = gId "List" `isPrefixOf` f
+    isList f = (gId "List") `isPrefixOf` f
 
 gfInstance :: Prefix -> (OIdent -> Bool) -> String -> (OIdent, [(OIdent, [OIdent])]) -> String
 gfInstance gId lexical m crs = hInstance gId lexical m crs ++++ fInstance gId lexical m crs
 
-hInstance :: (String -> String) -> (String -> Bool) -> String -> (String, [(OIdent, [OIdent])]) -> String
 ----hInstance m ("Cn",_) = "" --- seems to belong to an old applic. AR 18/5/2004
 hInstance gId _ m (cat,[]) = unlines [
   "instance Show" +++ gId cat,
@@ -220,39 +209,36 @@ hInstance gId _ m (cat,[]) = unlines [
   "  gf _ = undefined",
   "  fg _ = undefined"
   ]
-hInstance gId lexical m (cat,rules)
+hInstance gId lexical m (cat,rules) 
  | isListCat (cat,rules) =
   "instance Gf" +++ gId cat +++ "where" ++++
-     "  gf (" ++ gId cat +++ "[" ++ intercalate "," baseVars ++ "])"
+     "  gf (" ++ gId cat +++ "[" ++ concat (intersperse "," baseVars) ++ "])" 
            +++ "=" +++ mkRHS ("Base"++ec) baseVars ++++
-     "  gf (" ++ gId cat +++ "(x:xs)) = "
-           ++ mkRHS ("Cons"++ec) ["x",prParenth (gId cat+++"xs")]
+     "  gf (" ++ gId cat +++ "(x:xs)) = " 
+           ++ mkRHS ("Cons"++ec) ["x",prParenth (gId cat+++"xs")] 
 -- no show for GADTs
---     ++++ " gf (" ++ gId cat +++ "xs) = error (\"Bad " ++ cat ++ " value: \" ++ show xs)"
+--     ++++ " gf (" ++ gId cat +++ "xs) = error (\"Bad " ++ cat ++ " value: \" ++ show xs)" 
  | otherwise =
   "instance Gf" +++ gId cat +++ "where\n" ++
   unlines ([mkInst f xx | (f,xx) <- nonLexicalRules (lexical cat) rules]
-            ++ if lexical cat then ["  gf (" ++ lexicalConstructor cat +++ "x) = mkApp x []"] else [])
+            ++ if lexical cat then ["  gf (" ++ lexicalConstructor cat +++ "x) = mkApp (mkCId x) []"] else [])
  where
    ec = elemCat cat
    baseVars = mkVars (baseSize (cat,rules))
    mkInst f xx = let xx' = mkVars (length xx) in "  gf " ++
-     (if null xx then gId f else prParenth (gId f +++ foldr1 (+++) xx')) +++
+     (if length xx == 0 then gId f else prParenth (gId f +++ foldr1 (+++) xx')) +++
      "=" +++ mkRHS f xx'
-   mkRHS f vars = "mkApp \"" ++ f ++ "\"" +++
-       "[" ++ prTList ", " ["gf" +++ x | x <- vars] ++ "]"
+   mkRHS f vars = "mkApp (mkCId \"" ++ f ++ "\")" +++ 
+		   "[" ++ prTList ", " ["gf" +++ x | x <- vars] ++ "]"
 
-mkVars :: Int -> [String]
 mkVars = mkSVars "x"
-
-mkSVars :: String -> Int -> [String]
 mkSVars s n = [s ++ show i | i <- [1..n]]
 
 ----fInstance m ("Cn",_) = "" ---
 fInstance _ _ m (cat,[]) = ""
 fInstance gId lexical m (cat,rules) =
   "  fg t =" ++++
-  (if isList
+  (if isList 
     then "    " ++ gId cat ++ " (fgs t) where\n     fgs t = case unApp t of"
     else "    case unApp t of") ++++
   unlines [mkInst f xx | (f,xx) <- nonLexicalRules (lexical cat) rules] ++++
@@ -263,17 +249,16 @@ fInstance gId lexical m (cat,rules) =
     mkInst f xx =
      "      Just (i," ++
      "[" ++ prTList "," xx' ++ "])" +++
-     "| i == \"" ++ f ++ "\" ->" +++ mkRHS f xx'
-       where
-         xx' = ["x" ++ show i | (_,i) <- zip xx [1..]]
-         mkRHS f vars
-           | isList =
-               if "Base" `isPrefixOf` f
-                             then "[" ++ prTList ", " [ "fg" +++ x | x <- vars ] ++ "]"
-                 else "fg" +++ (vars !! 0) +++ ":" +++ "fgs" +++ (vars !! 1)
-           | otherwise =
-               gId f +++
-               prTList " " [prParenth ("fg" +++ x) | x <- vars]
+     "| i == mkCId \"" ++ f ++ "\" ->" +++ mkRHS f xx'
+       where xx' = ["x" ++ show i | (_,i) <- zip xx [1..]]
+	     mkRHS f vars 
+		 | isList =
+		     if "Base" `isPrefixOf` f 
+                       then "[" ++ prTList ", " [ "fg" +++ x | x <- vars ] ++ "]"
+		       else "fg" +++ (vars !! 0) +++ ":" +++ "fgs" +++ (vars !! 1)
+		 | otherwise = 
+		     gId f +++  
+		     prTList " " [prParenth ("fg" +++ x) | x <- vars]
 
 --type HSkeleton = [(OIdent, [(OIdent, [OIdent])])]
 hSkeleton :: PGF -> (String,HSkeleton)
@@ -302,10 +287,9 @@ updateSkeleton cat skel rule =
 -}
 isListCat :: (OIdent, [(OIdent, [OIdent])]) -> Bool
 isListCat (cat,rules) = "List" `isPrefixOf` cat && length rules == 2
-        && ("Base"++c) `elem` fs && ("Cons"++c) `elem` fs
-    where
-      c = elemCat cat
-      fs = map fst rules
+		    && ("Base"++c) `elem` fs && ("Cons"++c) `elem` fs
+    where c = elemCat cat
+	  fs = map fst rules
 
 -- | Gets the element category of a list category.
 elemCat :: OIdent -> OIdent
@@ -322,7 +306,7 @@ baseSize (_,rules) = length bs
     where Just (_,bs) = find (("Base" `isPrefixOf`) . fst) rules
 
 composClass :: [String]
-composClass =
+composClass = 
     [
      "",
      "class Compos t where",
@@ -349,3 +333,4 @@ composClass =
      "",
      "newtype C b a = C { unC :: b }"
     ]
+

src/compiler/GF/Compile/PGFtoJSON.hs

@@ -0,0 +1,110 @@
+module GF.Compile.PGFtoJSON (pgf2json) where
+
+import PGF2
+import PGF2.Internal
+import Text.JSON
+import qualified Data.Map as Map
+
+pgf2json :: PGF -> String
+pgf2json pgf =
+  encode $ makeObj
+    [ ("abstract", abstract2json pgf)
+    , ("concretes", makeObj $ map concrete2json
+                                (Map.toList (languages pgf)))
+    ]
+
+abstract2json :: PGF -> JSValue
+abstract2json pgf =
+  makeObj
+    [ ("name", showJSON (abstractName pgf))
+    , ("startcat", showJSON (showType [] (startCat pgf)))
+    , ("funs", makeObj $ map (absdef2json pgf) (functions pgf))
+    ]
+
+absdef2json :: PGF -> Fun -> (String,JSValue)
+absdef2json pgf f = (f,sig)
+  where
+    Just (hypos,cat,_) = fmap unType (functionType pgf f)
+    sig = makeObj
+      [ ("args", showJSON $ map (\(_,_,ty) -> showType [] ty) hypos)
+      , ("cat", showJSON cat)
+      ]
+
+lit2json :: Literal -> JSValue
+lit2json (LStr s) = showJSON s
+lit2json (LInt n) = showJSON n
+lit2json (LFlt d) = showJSON d
+
+concrete2json :: (ConcName,Concr) -> (String,JSValue)
+concrete2json (c,cnc) = (c,obj)
+  where
+    obj = makeObj
+      [ ("flags", makeObj [(k, lit2json v) | (k,v) <- concrFlags cnc])
+      , ("productions", makeObj [(show fid, showJSON (map frule2json (concrProductions cnc fid))) | (_,start,end,_) <- concrCategories cnc, fid <- [start..end]])
+      , ("functions", showJSON [ffun2json funid (concrFunction cnc funid) | funid <- [0..concrTotalFuns cnc-1]])
+      , ("sequences", showJSON [seq2json seqid (concrSequence cnc seqid) | seqid <- [0..concrTotalSeqs cnc-1]])
+      , ("categories", makeObj $ map cat2json (concrCategories cnc))
+      , ("totalfids", showJSON (concrTotalCats cnc))
+      ]
+
+cat2json :: (Cat,FId,FId,[String]) -> (String,JSValue)
+cat2json (cat,start,end,_) = (cat, ixs)
+  where
+    ixs = makeObj
+      [ ("start", showJSON start)
+      , ("end",   showJSON end)
+      ]
+
+frule2json :: Production -> JSValue
+frule2json (PApply fid args) =
+  makeObj
+    [ ("type", showJSON "Apply")
+    , ("fid",  showJSON fid)
+    , ("args", showJSON (map farg2json args))
+    ]
+frule2json (PCoerce arg) =
+  makeObj
+    [ ("type", showJSON "Coerce")
+    , ("arg",  showJSON arg)
+    ]
+
+farg2json :: PArg -> JSValue
+farg2json (PArg hypos fid) =
+  makeObj
+    [ ("type", showJSON "PArg")
+    , ("hypos", JSArray $ map (showJSON . snd) hypos)
+    , ("fid", showJSON fid)
+    ]
+
+ffun2json :: FunId -> (Fun,[SeqId]) -> JSValue
+ffun2json funid (fun,seqids) =
+  makeObj
+    [ ("name", showJSON fun)
+    , ("lins", showJSON seqids)
+    ]
+
+seq2json :: SeqId -> [Symbol] -> JSValue
+seq2json seqid seq = showJSON [sym2json sym | sym <- seq]
+
+sym2json :: Symbol -> JSValue
+sym2json (SymCat n l)    = new "SymCat" [showJSON n, showJSON l]
+sym2json (SymLit n l)    = new "SymLit" [showJSON n, showJSON l]
+sym2json (SymVar n l)    = new "SymVar" [showJSON n, showJSON l]
+sym2json (SymKS t)       = new "SymKS"  [showJSON t]
+sym2json (SymKP ts alts) = new "SymKP"  [JSArray (map sym2json ts), JSArray (map alt2json alts)]
+sym2json SymBIND         = new "SymKS"  [showJSON "&+"]
+sym2json SymSOFT_BIND    = new "SymKS"  [showJSON "&+"]
+sym2json SymSOFT_SPACE   = new "SymKS"  [showJSON "&+"]
+sym2json SymCAPIT        = new "SymKS"  [showJSON "&|"]
+sym2json SymALL_CAPIT    = new "SymKS"  [showJSON "&|"]
+sym2json SymNE           = new "SymNE"  []
+
+alt2json :: ([Symbol],[String]) -> JSValue
+alt2json (ps,ts) = new "Alt" [showJSON (map sym2json ps), showJSON ts]
+
+new :: String -> [JSValue] -> JSValue
+new f xs =
+  makeObj
+    [ ("type", showJSON f)
+    , ("args", showJSON xs)
+    ]

src/compiler/GF/Compile/ReadFiles.hs

@@ -50,7 +50,7 @@ import System.FilePath
 import GF.Text.Pretty
 
 type ModName = String
-type ModEnv  = Map.Map ModName (FilePath,UTCTime,[ModName])
+type ModEnv  = Map.Map ModName (UTCTime,[ModName])
 
 
 -- | Returns a list of all files to be compiled in topological order i.e.
@@ -98,17 +98,14 @@ getAllFiles opts ps env file = do
     -- returns 'ModuleInfo'. It fails if there is no such module
   --findModule :: ModName -> IOE ModuleInfo
     findModule name = do
-      (file,gfTime,gfoTime) <- findFile gfoDir ps env name
+      (file,gfTime,gfoTime) <- findFile gfoDir ps name
 
       let mb_envmod = Map.lookup name env
-          (st,t) = selectFormat opts (fmap snd3 mb_envmod) gfTime gfoTime
-
-          snd3 (_,y,_) = y
-          thd3 (_,_,z) = z
+          (st,t) = selectFormat opts (fmap fst mb_envmod) gfTime gfoTime
 
       (st,(mname,imps)) <-
           case st of
-            CSEnv  -> return (st, (name, maybe [] thd3 mb_envmod))
+            CSEnv  -> return (st, (name, maybe [] snd mb_envmod))
             CSRead -> do let gfo = if isGFO file then file else gf2gfo opts file
                          t_imps <- gfoImports gfo
                          case t_imps of
@@ -124,8 +121,8 @@ getAllFiles opts ps env file = do
       return (name,st,t,isJust gfTime,imps,dropFileName file)
 --------------------------------------------------------------------------------
 
-findFile gfoDir ps env name =
-  maybe noSource haveSource =<< getFilePath ps (gfFile name)
+findFile gfoDir ps name =
+    maybe noSource haveSource =<< getFilePath ps (gfFile name)
   where
     haveSource gfFile =
       do gfTime  <- getModificationTime gfFile
@@ -133,7 +130,7 @@ findFile gfoDir ps env name =
          return (gfFile, Just gfTime, mb_gfoTime)
 
     noSource =
-      maybe noGFO haveGFO =<< getFilePath gfoPath (gfoFile name)
+        maybe noGFO haveGFO =<< getFilePath gfoPath (gfoFile name)
       where
         gfoPath = maybe id (:) gfoDir ps
 
@@ -141,11 +138,8 @@ findFile gfoDir ps env name =
           do gfoTime <- getModificationTime gfoFile
              return (gfoFile, Nothing, Just gfoTime)
 
-        noGFO =
-          case Map.lookup name env of
-            Just (fpath,t,_) -> return (fpath, Nothing, Nothing)
-            Nothing          -> raise (render ("File" <+> gfFile name <+> "does not exist." $$
-                                       "searched in:" <+> vcat ps <+> (show (env :: Map.Map ModName (FilePath,UTCTime,[ModName])))))
+        noGFO = raise (render ("File" <+> gfFile name <+> "does not exist." $$
+                               "searched in:" <+> vcat ps))
 
 gfImports opts file = importsOfModule `fmap` parseModHeader opts file
 

src/compiler/GF/Compile/Rename.hs

@@ -5,7 +5,7 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/05/30 18:39:44 $
+-- > CVS $Date: 2005/05/30 18:39:44 $ 
 -- > CVS $Author: aarne $
 -- > CVS $Revision: 1.19 $
 --
@@ -23,9 +23,9 @@
 -----------------------------------------------------------------------------
 
 module GF.Compile.Rename (
-     renameSourceTerm,
-     renameModule
-    ) where
+	       renameSourceTerm,
+	       renameModule
+	      ) where
 
 import GF.Infra.Ident
 import GF.Infra.CheckM
@@ -36,11 +36,9 @@ import GF.Grammar.Lookup
 import GF.Grammar.Macros
 import GF.Grammar.Printer
 import GF.Data.Operations
-import PGF2(abstractName,functionType,categoryContext)
 
 import Control.Monad
 import Data.List (nub,(\\))
-import qualified Data.List as L
 import qualified Data.Map as Map
 import Data.Maybe(mapMaybe)
 import GF.Text.Pretty
@@ -59,30 +57,35 @@ renameModule cwd gr mo@(m,mi) = do
   return (m, mi{jments = js})
 
 type Status = (StatusMap, [(OpenSpec, StatusMap)])
-type StatusMap = Ident -> Maybe Term
+
+type StatusMap = Map.Map Ident StatusInfo
+
+type StatusInfo = Ident -> Term
 
 -- Delays errors, allowing many errors to be detected and reported
 renameIdentTerm env = accumulateError (renameIdentTerm' env)
 
 -- Fails immediately on error, makes it possible to try other possibilities
 renameIdentTerm' :: Status -> Term -> Check Term
-renameIdentTerm' env@(act,imps) t0 =
+renameIdentTerm' env@(act,imps) t0 = 
   case t0 of
     Vr c -> ident predefAbs c
     Cn c -> ident (\_ s -> checkError s) c
     Q (m',c) | m' == cPredef {- && isInPredefined c -} -> return t0
     Q (m',c) -> do
-      f <- lookupErr m' qualifs
-      maybe (notFound c) return (f c)
+      m <- lookupErr m' qualifs
+      f <- lookupIdent c m
+      return $ f c
     QC (m',c) | m' == cPredef {- && isInPredefined c -} -> return t0
     QC (m',c) -> do
-      f <- lookupErr m' qualifs
-      maybe (notFound c) return (f c)
+      m <- lookupErr m' qualifs
+      f <- lookupIdent c m
+      return $ f c
     _ -> return t0
   where
     opens   = [st  | (OSimple _,st) <- imps]
-    qualifs = [(m, st) | (OQualif m _, st) <- imps] ++
-              [(m, st) | (OQualif _ m, st) <- imps] ++
+    qualifs = [(m, st) | (OQualif m _, st) <- imps] ++ 
+              [(m, st) | (OQualif _ m, st) <- imps] ++ 
               [(m, st) | (OSimple m, st) <- imps] -- qualif is always possible
 
     -- this facility is mainly for BWC with GF1: you need not import PredefAbs
@@ -90,71 +93,51 @@ renameIdentTerm' env@(act,imps) t0 =
       | isPredefCat c = return (Q (cPredefAbs,c))
       | otherwise     = checkError s
 
-    ident alt c =
-      case act c of
-        Just t -> return t
-        _      -> case mapMaybe (\f -> f c) opens of
-                    [t]  -> return t
+    ident alt c = 
+      case Map.lookup c act of
+        Just f -> return (f c)
+        _      -> case mapMaybe (Map.lookup c) opens of
+                    [f]  -> return (f c)
                     []   -> alt c ("constant not found:" <+> c $$
                                    "given" <+> fsep (punctuate ',' (map fst qualifs)))
-                    ts   -> case nub ts  of
-                              [t]      -> return t
+                    fs   -> case nub [f c | f <- fs]  of
+                              [tr]     -> return tr
                               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
 
-info2status :: Maybe ModuleName -> Ident -> Info -> Term
+info2status :: Maybe ModuleName -> Ident -> Info -> StatusInfo
 info2status mq c i = case i of
-  AbsFun _ _ Nothing _ -> maybe Con (curry QC) mq c
-  ResValue _ _ -> maybe Con (curry QC) mq c
-  ResParam _ _ -> maybe Con (curry QC) mq c
-  AnyInd True m -> maybe Con (const (curry QC m)) mq c
-  AnyInd False m -> maybe Cn (const (curry Q m)) mq c
-  _           -> maybe Cn (curry Q) mq c
+  AbsFun _ _ Nothing _ -> maybe Con (curry QC) mq
+  ResValue _ _  -> maybe Con (curry QC) mq
+  ResParam _ _  -> maybe Con (curry QC) mq
+  AnyInd True m -> maybe Con (const (curry QC m)) mq
+  AnyInd False m -> maybe Cn (const (curry Q m)) mq
+  _           -> maybe Cn (curry Q) mq
 
 tree2status :: OpenSpec -> Map.Map Ident Info -> StatusMap
-tree2status o map = case o of
-  OSimple i   -> flip Map.lookup (Map.mapWithKey (info2status (Just i)) map)
-  OQualif i j -> flip Map.lookup (Map.mapWithKey (info2status (Just j)) map)
+tree2status o = case o of
+  OSimple i   -> Map.mapWithKey (info2status (Just i))
+  OQualif i j -> Map.mapWithKey (info2status (Just j))
 
 buildStatus :: FilePath -> Grammar -> Module -> Check Status
 buildStatus cwd gr mo@(m,mi) = checkInModule cwd mi NoLoc empty $ do
   let gr1  = prependModule gr mo
-      exts = [(o,modInfo2status o mi) | (m,mi) <- allExtends gr1 m, let o = OSimple m]
-  ops <- mapM (openSpec2status gr1) (mopens mi)
-  let sts = exts++ops
+      exts = [(OSimple m,mi) | (m,mi) <- allExtends gr1 m]
+  ops <- mapM (\o -> lookupModule gr1 (openedModule o) >>= \mi -> return (o,mi)) (mopens mi)
+  let sts = map modInfo2status (exts++ops)
   return (if isModCnc mi
-            then (const Nothing,   reverse sts)  -- the module itself does not define any names
-            else (self2status m mi,reverse sts))
+            then (Map.empty,       reverse sts)  -- the module itself does not define any names
+            else (self2status m mi,reverse sts)) -- so the empty ident is not needed
 
-openSpec2status gr o =
-  do mi <- lookupModule gr (openedModule o)
-     return (o,modInfo2status o mi)
-  where
-    mn = openedModule o
-
-pgf2status o pgf id =
-  case functionType pgf sid of
-    Just _  -> Just (QC (mn, id))
-    Nothing -> case categoryContext pgf sid of
-                 Just _  -> Just (QC (mn, id))
-                 Nothing -> Nothing
-  where
-    sid = showIdent id
-
-    mn = case o of
-           OSimple i   -> i
-           OQualif i j -> j
-
-modInfo2status :: OpenSpec -> ModuleInfo -> StatusMap
-modInfo2status o (ModInfo{jments=jments}) = tree2status o jments
-modInfo2status o (ModPGF pgf) = pgf2status o pgf
+modInfo2status :: (OpenSpec,ModuleInfo) -> (OpenSpec, StatusMap)
+modInfo2status (o,mo) = (o,tree2status o (jments mo))
 
 self2status :: ModuleName -> ModuleInfo -> StatusMap
-self2status c m = flip Map.lookup (Map.mapWithKey (info2status (Just c)) (jments m))
-
+self2status c m = Map.mapWithKey (info2status (Just c)) (jments m)
 
+  
 renameInfo :: FilePath -> Status -> Module -> Ident -> Info -> Check Info
 renameInfo cwd status (m,mi) i info =
   case info of
@@ -165,9 +148,9 @@ renameInfo cwd status (m,mi) i info =
     ResParam (Just pp) m -> do
       pp' <- renLoc (mapM (renParam status)) pp
       return (ResParam (Just pp') m)
-    ResValue t i -> do
-      t <- renLoc (renameTerm status []) t
-      return (ResValue t i)
+    ResValue ty offset -> do
+      t <- renLoc (renameTerm status []) ty
+      return (ResValue ty offset)
     CncCat mcat mdef mref mpr mpmcfg -> liftM5 CncCat (renTerm mcat) (renTerm mdef) (renTerm mref) (renTerm mpr) (return mpmcfg)
     CncFun mty mtr mpr mpmcfg -> liftM3 (CncFun mty)         (renTerm mtr) (renTerm mpr) (return mpmcfg)
     _ -> return info
@@ -195,9 +178,9 @@ renameInfo cwd status (m,mi) i info =
         return (ps',t')
 
     renParam :: Status -> Param -> Check Param
-    renParam env (c,co) = do
+    renParam env (c,co,i) = do
       co' <- renameContext env co
-      return (c,co')
+      return (c,co',i)
 
 renameTerm :: Status -> [Ident] -> Term -> Check Term
 renameTerm env vars = ren vars where
@@ -205,7 +188,7 @@ renameTerm env vars = ren vars where
     Abs b x t    -> liftM  (Abs b x) (ren (x:vs) t)
     Prod bt x a b -> liftM2 (Prod bt x) (ren vs a) (ren (x:vs) b)
     Typed a b  -> liftM2 Typed (ren vs a) (ren vs b)
-    Vr x
+    Vr x      
       | elem x vs -> return trm
       | otherwise -> renid trm
     Cn _   -> renid trm
@@ -216,7 +199,7 @@ renameTerm env vars = ren vars where
       i' <- case i of
         TTyped ty -> liftM TTyped $ ren vs ty -- the only annotation in source
         _ -> return i
-      liftM (T i') $ mapM (renCase vs) cs
+      liftM (T i') $ mapM (renCase vs) cs  
 
     Let (x,(m,a)) b -> do
       m' <- case m of
@@ -226,7 +209,7 @@ renameTerm env vars = ren vars where
       b' <- ren (x:vs) b
       return $ Let (x,(m',a')) b'
 
-    P t@(Vr r) l                                               -- Here we have $r.l$ and this is ambiguous it could be either
+    P t@(Vr r) l                                               -- Here we have $r.l$ and this is ambiguous it could be either 
                                                                -- record projection from variable or constant $r$ or qualified expression with module $r$
       | elem r vs -> return trm                                -- try var proj first ..
       | otherwise -> checks [ renid' (Q (MN r,label2ident l))      -- .. and qualified expression second.
@@ -234,16 +217,9 @@ renameTerm env vars = ren vars where
                             , checkError ("unknown qualified constant" <+> trm)
                             ]
 
-    EPatt minp maxp p -> do
+    EPatt p -> do
       (p',_) <- renpatt p
-      return $ EPatt minp maxp p'
-
-    Reset ctl mb_ct t qid -> do
-      mv_ct <- case mb_ct of
-                 Just ct -> liftM Just $ ren vs ct
-                 Nothing -> return mb_ct
-      t <- ren vs t
-      return (Reset ctl mv_ct t qid)
+      return $ EPatt p'
 
     _ -> composOp (ren vs) trm
 
@@ -260,7 +236,7 @@ renamePattern :: Status -> Patt -> Check (Patt,[Ident])
 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. All variable names on the left-hand side must be distinct.") 4
+       unless (null dupl) $ checkError (hang ("[C.4.13] Pattern is not linear:") 4
                                              patt)
        return r
   where
@@ -310,14 +286,14 @@ renamePattern env patt =
         (q',ws) <- renp q
         return (PAlt p' q', vs ++ ws)
 
-      PSeq minp maxp p minq maxq q -> do
+      PSeq p q -> do
         (p',vs) <- renp p
         (q',ws) <- renp q
-        return (PSeq minp maxp p' minq maxq q', vs ++ ws)
+        return (PSeq p' q', vs ++ ws)
 
-      PRep minp maxp p -> do
+      PRep p -> do
         (p',vs) <- renp p
-        return (PRep minp maxp p', vs)
+        return (PRep p', vs)
 
       PNeg p -> do
         (p',vs) <- renp p
@@ -335,8 +311,8 @@ renamePattern env patt =
 renameContext :: Status -> Context -> Check Context
 renameContext b = renc [] where
   renc vs cont = case cont of
-    (bt,x,t) : xts
-      | x == identW -> do
+    (bt,x,t) : xts 
+      | isWildIdent x -> do
           t'   <- ren vs t
           xts' <- renc vs xts
           return $ (bt,x,t') : xts'

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

@@ -5,7 +5,7 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/09/15 16:22:02 $
+-- > CVS $Date: 2005/09/15 16:22:02 $ 
 -- > CVS $Author: aarne $
 -- > CVS $Revision: 1.16 $
 --
@@ -13,11 +13,11 @@
 -----------------------------------------------------------------------------
 
 module GF.Compile.TypeCheck.Abstract (-- * top-level type checking functions; TC should not be called directly.
-    checkContext,
-    checkTyp,
-    checkDef,
-    checkConstrs,
-   ) where
+		  checkContext,
+		  checkTyp,
+		  checkDef,
+		  checkConstrs,
+		 ) where
 
 import GF.Data.Operations
 
@@ -33,8 +33,8 @@ import GF.Text.Pretty
 --import Control.Monad (foldM, liftM, liftM2)
 
 -- | invariant way of creating TCEnv from context
-initTCEnv gamma =
-  (length gamma,[(x,VGen i x) | ((x,_),i) <- zip gamma [0..]], gamma)
+initTCEnv gamma = 
+  (length gamma,[(x,VGen i x) | ((x,_),i) <- zip gamma [0..]], gamma) 
 
 -- interface to TC type checker
 

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

@@ -0,0 +1,721 @@
+{-# LANGUAGE PatternGuards #-}
+module GF.Compile.TypeCheck.Concrete( {-checkLType, inferLType, computeLType, ppType-} ) where
+{-
+import GF.Infra.CheckM
+import GF.Data.Operations
+
+import GF.Grammar
+import GF.Grammar.Lookup
+import GF.Grammar.Predef
+import GF.Grammar.PatternMatch
+import GF.Grammar.Lockfield (isLockLabel, lockRecType, unlockRecord)
+import GF.Compile.TypeCheck.Primitives
+
+import Data.List
+import Control.Monad
+import GF.Text.Pretty
+
+computeLType :: SourceGrammar -> Context -> Type -> Check Type
+computeLType gr g0 t = comp (reverse [(b,x, Vr x) | (b,x,_) <- g0] ++ g0) t
+ where
+  comp g ty = case ty of
+    _ | Just _ <- isTypeInts ty -> return ty ---- shouldn't be needed
+      | isPredefConstant ty     -> return ty ---- shouldn't be needed
+
+    Q (m,ident) -> checkIn (text "module" <+> ppIdent m) $ do
+      ty' <- lookupResDef gr (m,ident)
+      if ty' == ty then return ty else comp g ty' --- is this necessary to test?
+
+    Vr ident  -> checkLookup ident g -- never needed to compute!
+
+    App f a -> do
+      f' <- comp g f
+      a' <- comp g a
+      case f' of
+        Abs b x t -> comp ((b,x,a'):g) t
+        _ -> return $ App f' a'
+
+    Prod bt x a b -> do
+      a' <- comp g a
+      b' <- comp ((bt,x,Vr x) : g) b
+      return $ Prod bt x a' b'
+
+    Abs bt x b -> do
+      b' <- comp ((bt,x,Vr x):g) b
+      return $ Abs bt x b'
+
+    Let (x,(_,a)) b -> comp ((Explicit,x,a):g) b
+
+    ExtR r s -> do
+      r' <- comp g r
+      s' <- comp g s
+      case (r',s') of
+        (RecType rs, RecType ss) -> plusRecType r' s' >>= comp g
+        _ -> return $ ExtR r' s'
+
+    RecType fs -> do
+      let fs' = sortRec fs
+      liftM RecType $ mapPairsM (comp g) fs'
+
+    ELincat c t -> do
+      t' <- comp g t
+      lockRecType c t' ---- locking to be removed AR 20/6/2009
+
+    _ | ty == typeTok -> return typeStr
+    _ | isPredefConstant ty -> return ty
+
+    _ -> composOp (comp g) ty
+
+-- the underlying algorithms
+
+inferLType :: SourceGrammar -> Context -> Term -> Check (Term, Type)
+inferLType gr g trm = case trm of
+
+   Q (m,ident) | isPredef m -> termWith trm $ case typPredefined ident of
+                                                Just ty -> return ty
+                                                Nothing -> checkError (text "unknown in Predef:" <+> ppIdent ident)
+
+   Q ident -> checks [
+     termWith trm $ lookupResType gr ident >>= computeLType gr g
+     ,
+     lookupResDef gr ident >>= inferLType gr g
+     ,
+     checkError (text "cannot infer type of constant" <+> ppTerm Unqualified 0 trm)
+     ]
+
+   QC (m,ident) | isPredef m -> termWith trm $ case typPredefined ident of
+                                                 Just ty -> return ty
+                                                 Nothing -> checkError (text "unknown in Predef:" <+> ppIdent ident)
+
+   QC ident -> checks [
+       termWith trm $ lookupResType gr ident >>= computeLType gr g
+       ,
+       lookupResDef gr ident >>= inferLType gr g
+       ,
+       checkError (text "cannot infer type of canonical constant" <+> ppTerm Unqualified 0 trm)
+       ]
+
+   Vr ident -> termWith trm $ checkLookup ident g
+
+   Typed e t -> do
+     t' <- computeLType gr g t
+     checkLType gr g e t'
+     return (e,t')
+
+   App f a -> do
+     over <- getOverload gr g Nothing trm
+     case over of
+       Just trty -> return trty
+       _ -> do
+         (f',fty) <- inferLType gr g f
+         fty' <- computeLType gr g fty
+         case fty' of
+           Prod bt z arg val -> do 
+             a' <- justCheck g a arg
+             ty <- if isWildIdent z 
+                      then return val
+                      else substituteLType [(bt,z,a')] val
+             return (App f' a',ty) 
+           _ -> checkError (text "A function type is expected for" <+> ppTerm Unqualified 0 f <+> text "instead of type" <+> ppType fty)
+
+   S f x -> do
+     (f', fty) <- inferLType gr g f
+     case fty of
+       Table arg val -> do
+         x'<- justCheck g x arg
+         return (S f' x', val)
+       _ -> checkError (text "table lintype expected for the table in" $$ nest 2 (ppTerm Unqualified 0 trm))
+
+   P t i -> do
+     (t',ty) <- inferLType gr g t   --- ??
+     ty' <- computeLType gr g ty
+     let tr2 = P t' i
+     termWith tr2 $ case ty' of
+       RecType ts -> case lookup i ts of
+                       Nothing -> checkError (text "unknown label" <+> ppLabel i <+> text "in" $$ nest 2 (ppTerm Unqualified 0 ty'))
+                       Just x  -> return x
+       _          -> checkError (text "record type expected for:" <+> ppTerm Unqualified 0 t $$
+                                 text " instead of the inferred:" <+> ppTerm Unqualified 0 ty')
+
+   R r -> do
+     let (ls,fs) = unzip r
+     fsts <- mapM inferM fs
+     let ts = [ty | (Just ty,_) <- fsts]
+     checkCond (text "cannot infer type of record" $$ nest 2 (ppTerm Unqualified 0 trm)) (length ts == length fsts)
+     return $ (R (zip ls fsts), RecType (zip ls ts))
+
+   T (TTyped arg) pts -> do
+     (_,val) <- checks $ map (inferCase (Just arg)) pts
+     checkLType gr g trm (Table arg val)
+   T (TComp arg) pts -> do
+     (_,val) <- checks $ map (inferCase (Just arg)) pts
+     checkLType gr g trm (Table arg val)
+   T ti pts -> do  -- tries to guess: good in oper type inference
+     let pts' = [pt | pt@(p,_) <- pts, isConstPatt p]
+     case pts' of 
+       [] -> checkError (text "cannot infer table type of" <+> ppTerm Unqualified 0 trm)
+----       PInt k : _ -> return $ Ints $ max [i | PInt i <- pts'] 
+       _  -> do 
+         (arg,val) <- checks $ map (inferCase Nothing) pts'
+         checkLType gr g trm (Table arg val)
+   V arg pts -> do
+     (_,val) <- checks $ map (inferLType gr g) pts
+--   return (trm, Table arg val) -- old, caused issue 68
+     checkLType gr g trm (Table arg val)
+
+   K s  -> do
+     if elem ' ' s
+        then do
+          let ss = foldr C Empty (map K (words s))  
+          ----- removed irritating warning AR 24/5/2008
+          ----- checkWarn ("token \"" ++ s ++ 
+          -----              "\" converted to token list" ++ prt ss)
+          return (ss, typeStr)
+        else return (trm, typeStr)
+
+   EInt i -> return (trm, typeInt)
+
+   EFloat i -> return (trm, typeFloat)
+
+   Empty -> return (trm, typeStr)
+
+   C s1 s2 -> 
+     check2 (flip (justCheck g) typeStr) C s1 s2 typeStr
+
+   Glue s1 s2 -> 
+     check2 (flip (justCheck g) typeStr) Glue s1 s2 typeStr ---- typeTok
+
+---- hack from Rename.identRenameTerm, to live with files with naming conflicts 18/6/2007
+   Strs (Cn c : ts) | c == cConflict -> do
+     checkWarn (text "unresolved constant, could be any of" <+> hcat (map (ppTerm Unqualified 0) ts))
+     inferLType gr g (head ts)
+
+   Strs ts -> do
+     ts' <- mapM (\t -> justCheck g t typeStr) ts 
+     return (Strs ts', typeStrs)
+
+   Alts t aa -> do
+     t'  <- justCheck g t typeStr
+     aa' <- flip mapM aa (\ (c,v) -> do
+        c' <- justCheck g c typeStr 
+        v' <- checks $ map (justCheck g v) [typeStrs, EPattType typeStr]
+        return (c',v'))
+     return (Alts t' aa', typeStr)
+
+   RecType r -> do
+     let (ls,ts) = unzip r
+     ts' <- mapM (flip (justCheck g) typeType) ts 
+     return (RecType (zip ls ts'), typeType)
+
+   ExtR r s -> do
+     (r',rT) <- inferLType gr g r 
+     rT'     <- computeLType gr g rT
+     (s',sT) <- inferLType gr g s
+     sT'     <- computeLType gr g sT
+
+     let trm' = ExtR r' s'
+     ---- trm'    <- plusRecord r' s'
+     case (rT', sT') of
+       (RecType rs, RecType ss) -> do
+         rt <- plusRecType rT' sT'
+         checkLType gr g trm' rt ---- return (trm', rt)
+       _ | rT' == typeType && sT' == typeType -> return (trm', typeType)
+       _ -> checkError (text "records or record types expected in" <+> ppTerm Unqualified 0 trm)
+
+   Sort _     -> 
+     termWith trm $ return typeType
+
+   Prod bt x a b -> do
+     a' <- justCheck g a typeType
+     b' <- justCheck ((bt,x,a'):g) b typeType
+     return (Prod bt x a' b', typeType)
+
+   Table p t  -> do
+     p' <- justCheck g p typeType --- check p partype! 
+     t' <- justCheck g t typeType
+     return $ (Table p' t', typeType)
+
+   FV vs -> do
+     (_,ty) <- checks $ map (inferLType gr g) vs
+---     checkIfComplexVariantType trm ty
+     checkLType gr g trm ty
+
+   EPattType ty -> do
+     ty' <- justCheck g ty typeType
+     return (EPattType ty',typeType)
+   EPatt p -> do
+     ty <- inferPatt p
+     return (trm, EPattType ty)
+
+   ELin c trm -> do
+     (trm',ty) <- inferLType gr g trm
+     ty' <- lockRecType c ty ---- lookup c; remove lock AR 20/6/2009
+     return $ (ELin c trm', ty') 
+
+   _ -> checkError (text "cannot infer lintype of" <+> ppTerm Unqualified 0 trm)
+
+ where
+   isPredef m = elem m [cPredef,cPredefAbs]
+
+   justCheck g ty te = checkLType gr g ty te >>= return . fst
+
+   -- for record fields, which may be typed
+   inferM (mty, t) = do
+     (t', ty') <- case mty of
+       Just ty -> checkLType gr g t ty
+       _ -> inferLType gr g t
+     return (Just ty',t')
+
+   inferCase mty (patt,term) = do
+     arg  <- maybe (inferPatt patt) return mty
+     cont <- pattContext gr g arg patt
+     (_,val) <- inferLType gr (reverse cont ++ g) term
+     return (arg,val)
+   isConstPatt p = case p of
+     PC _ ps -> True --- all isConstPatt ps
+     PP _ ps -> True --- all isConstPatt ps
+     PR ps -> all (isConstPatt . snd) ps
+     PT _ p -> isConstPatt p
+     PString _ -> True
+     PInt _ -> True
+     PFloat _ -> True
+     PChar -> True
+     PChars _ -> True
+     PSeq p q -> isConstPatt p && isConstPatt q
+     PAlt p q -> isConstPatt p && isConstPatt q
+     PRep p -> isConstPatt p
+     PNeg p -> isConstPatt p
+     PAs _ p -> isConstPatt p
+     _ -> False
+
+   inferPatt p = case p of
+     PP (q,c) ps | q /= cPredef -> liftM valTypeCnc (lookupResType gr (q,c))
+     PAs _ p  -> inferPatt p
+     PNeg p   -> inferPatt p
+     PAlt p q -> checks [inferPatt p, inferPatt q]
+     PSeq _ _ -> return $ typeStr
+     PRep _   -> return $ typeStr
+     PChar    -> return $ typeStr
+     PChars _ -> return $ typeStr
+     _ -> inferLType gr g (patt2term p) >>= return . snd
+
+
+-- type inference: Nothing, type checking: Just t
+-- the latter permits matching with value type
+getOverload :: SourceGrammar -> Context -> Maybe Type -> Term -> Check (Maybe (Term,Type))
+getOverload gr g mt ot = case appForm ot of
+     (f@(Q c), ts) -> case lookupOverload gr c of
+       Ok typs -> do
+         ttys <- mapM (inferLType gr g) ts
+         v <- matchOverload f typs ttys
+         return $ Just v
+       _ -> return Nothing
+     _ -> return Nothing
+ where
+   matchOverload f typs ttys = do
+     let (tts,tys) = unzip ttys
+     let vfs = lookupOverloadInstance tys typs
+     let matches = [vf | vf@((_,v,_),_) <- vfs, matchVal mt v]
+     let showTypes ty = hsep (map ppType ty)
+
+    
+     let (stys,styps) = (showTypes tys, [showTypes ty | (ty,_) <- typs])
+
+     -- to avoid strange error msg e.g. in case of unmatch record extension, show whole types if needed AR 28/1/2013
+     let (stysError,stypsError) = if elem (render stys) (map render styps)
+            then (hsep (map (ppTerm Unqualified 0) tys), [hsep (map (ppTerm Unqualified 0) ty) | (ty,_) <- typs])
+            else (stys,styps)
+
+     case ([vf | (vf,True) <- matches],[vf | (vf,False) <- matches]) of
+       ([(_,val,fun)],_) -> return (mkApp fun tts, val)
+       ([],[(pre,val,fun)]) -> do
+         checkWarn $  text "ignoring lock fields in resolving" <+> ppTerm Unqualified 0 ot $$
+                      text "for" $$
+                      nest 2 (showTypes tys) $$
+                      text "using" $$
+                      nest 2 (showTypes pre)
+         return (mkApp fun tts, val)
+       ([],[]) -> do
+         checkError $ text "no overload instance of" <+> ppTerm Unqualified 0 f $$
+                      text "for" $$
+                      nest 2 stysError $$
+                      text "among" $$
+                      nest 2 (vcat stypsError) $$
+                      maybe empty (\x -> text "with value type" <+> ppType x) mt
+
+       (vfs1,vfs2) -> case (noProds vfs1,noProds vfs2) of
+         ([(val,fun)],_) -> do
+           return (mkApp fun tts, val)
+         ([],[(val,fun)]) -> do
+           checkWarn (text "ignoring lock fields in resolving" <+> ppTerm Unqualified 0 ot) 
+           return (mkApp fun tts, val)
+
+----- unsafely exclude irritating warning AR 24/5/2008
+-----           checkWarn $ "overloading of" +++ prt f +++ 
+-----             "resolved by excluding partial applications:" ++++
+-----             unlines [prtType env ty | (ty,_) <- vfs', not (noProd ty)]
+
+
+         _ -> checkError $ text "ambiguous overloading of" <+> ppTerm Unqualified 0 f <+>
+                           text "for" <+> hsep (map ppType tys) $$ 
+                           text "with alternatives" $$
+                           nest 2 (vcat [ppType ty | (_,ty,_) <- if null vfs1 then vfs2 else vfs2])
+
+   matchVal mt v = elem mt [Nothing,Just v,Just (unlocked v)]
+
+   unlocked v = case v of
+     RecType fs -> RecType $ filter (not . isLockLabel . fst) fs
+     _ -> v
+   ---- TODO: accept subtypes
+   ---- TODO: use a trie
+   lookupOverloadInstance tys typs = 
+     [((pre,mkFunType rest val, t),isExact) | 
+       let lt = length tys,
+       (ty,(val,t)) <- typs, length ty >= lt,
+       let (pre,rest) = splitAt lt ty, 
+       let isExact = pre == tys,
+       isExact || map unlocked pre == map unlocked tys
+     ]
+
+   noProds vfs = [(v,f) | (_,v,f) <- vfs, noProd v]
+
+   noProd ty = case ty of
+     Prod _ _ _ _ -> False
+     _ -> True
+
+checkLType :: SourceGrammar -> Context -> Term -> Type -> Check (Term, Type)
+checkLType gr g trm typ0 = do
+
+  typ <- computeLType gr g typ0
+
+  case trm of
+
+    Abs bt x c -> do
+      case typ of
+        Prod bt' z a b -> do 
+          (c',b') <- if isWildIdent z
+                       then checkLType gr ((bt,x,a):g) c b
+                       else do b' <- checkIn (text "abs") $ substituteLType [(bt',z,Vr x)] b
+                               checkLType gr ((bt,x,a):g) c b'
+          return $ (Abs bt x c', Prod bt' x a b')
+        _ -> checkError $ text "function type expected instead of" <+> ppType typ
+
+    App f a -> do
+       over <- getOverload gr g (Just typ) trm
+       case over of
+         Just trty -> return trty
+         _ -> do
+          (trm',ty') <- inferLType gr g trm
+          termWith trm' $ checkEqLType gr g typ ty' trm'
+
+    Q _ -> do
+       over <- getOverload gr g (Just typ) trm
+       case over of
+         Just trty -> return trty
+         _ -> do
+          (trm',ty') <- inferLType gr g trm
+          termWith trm' $ checkEqLType gr g typ ty' trm'
+
+    T _ [] ->
+      checkError (text "found empty table in type" <+> ppTerm Unqualified 0 typ)
+    T _ cs -> case typ of 
+      Table arg val -> do 
+        case allParamValues gr arg of
+          Ok vs -> do
+            let ps0 = map fst cs
+            ps <- testOvershadow ps0 vs
+            if null ps 
+              then return () 
+              else checkWarn (text "patterns never reached:" $$
+                              nest 2 (vcat (map (ppPatt Unqualified 0) ps)))
+          _ -> return () -- happens with variable types
+        cs' <- mapM (checkCase arg val) cs
+        return (T (TTyped arg) cs', typ)
+      _ -> checkError $ text "table type expected for table instead of" $$ nest 2 (ppType typ)
+    V arg0 vs ->
+      case typ of
+        Table arg1 val ->
+           do arg' <- checkEqLType gr g arg0 arg1 trm
+              vs1 <- allParamValues gr arg1
+              if length vs1 == length vs
+                 then return ()
+                 else checkError $ text "wrong number of values in table" <+> ppTerm Unqualified 0 trm
+              vs' <- map fst `fmap` sequence [checkLType gr g v val|v<-vs]
+              return (V arg' vs',typ)
+
+    R r -> case typ of --- why needed? because inference may be too difficult
+       RecType rr -> do
+         let (ls,_) = unzip rr        -- labels of expected type
+         fsts <- mapM (checkM r) rr   -- check that they are found in the record
+         return $ (R fsts, typ)       -- normalize record
+
+       _ -> checkError (text "record type expected in type checking instead of" $$ nest 2 (ppTerm Unqualified 0 typ))
+
+    ExtR r s -> case typ of
+       _ | typ == typeType -> do
+         trm' <- computeLType gr g trm
+         case trm' of
+           RecType _ -> termWith trm $ return typeType
+           ExtR (Vr _) (RecType _) -> termWith trm $ return typeType 
+                                      -- ext t = t ** ...
+           _ -> checkError (text "invalid record type extension" <+> nest 2 (ppTerm Unqualified 0 trm))
+
+       RecType rr -> do
+         (r',ty,s') <- checks [
+            do (r',ty) <- inferLType gr g r
+               return (r',ty,s)
+           ,
+            do (s',ty) <- inferLType gr g s
+               return (s',ty,r)
+           ]
+
+         case ty of
+           RecType rr1 -> do
+                let (rr0,rr2) = recParts rr rr1
+                r2 <- justCheck g r' rr0
+                s2 <- justCheck g s' rr2
+                return $ (ExtR r2 s2, typ) 
+           _ -> checkError (text "record type expected in extension of" <+> ppTerm Unqualified 0 r $$
+                            text "but found" <+> ppTerm Unqualified 0 ty)
+
+       ExtR ty ex -> do
+         r' <- justCheck g r ty
+         s' <- justCheck g s ex
+         return $ (ExtR r' s', typ) --- is this all? it assumes the same division in trm and typ
+
+       _ -> checkError (text "record extension not meaningful for" <+> ppTerm Unqualified 0 typ)
+
+    FV vs -> do
+      ttys <- mapM (flip (checkLType gr g) typ) vs
+---      checkIfComplexVariantType trm typ
+      return (FV (map fst ttys), typ) --- typ' ?
+
+    S tab arg -> checks [ do
+      (tab',ty) <- inferLType gr g tab
+      ty'       <- computeLType gr g ty
+      case ty' of
+        Table p t -> do
+          (arg',val) <- checkLType gr g arg p
+          checkEqLType gr g typ t trm
+          return (S tab' arg', t)
+        _ -> checkError (text "table type expected for applied table instead of" <+> ppType ty')
+     , do
+      (arg',ty) <- inferLType gr g arg
+      ty'       <- computeLType gr g ty
+      (tab',_)  <- checkLType gr g tab (Table ty' typ)
+      return (S tab' arg', typ)
+      ]
+    Let (x,(mty,def)) body -> case mty of
+      Just ty -> do
+        (def',ty') <- checkLType gr g def ty
+        body' <- justCheck ((Explicit,x,ty'):g) body typ
+        return (Let (x,(Just ty',def')) body', typ)
+      _ -> do
+        (def',ty) <- inferLType gr g def  -- tries to infer type of local constant
+        checkLType gr g (Let (x,(Just ty,def')) body) typ
+
+    ELin c tr -> do
+      tr1 <- unlockRecord c tr
+      checkLType gr g tr1 typ
+
+    _ -> do
+      (trm',ty') <- inferLType gr g trm
+      termWith trm' $ checkEqLType gr g typ ty' trm'
+ where
+   justCheck g ty te = checkLType gr g ty te >>= return . fst
+
+   recParts rr t = (RecType rr1,RecType rr2) where 
+     (rr1,rr2) = partition (flip elem (map fst t) . fst) rr 
+
+   checkM rms (l,ty) = case lookup l rms of
+     Just (Just ty0,t) -> do
+       checkEqLType gr g ty ty0 t
+       (t',ty') <- checkLType gr g t ty
+       return (l,(Just ty',t'))
+     Just (_,t) -> do
+       (t',ty') <- checkLType gr g t ty
+       return (l,(Just ty',t'))
+     _ -> checkError $ 
+            if isLockLabel l 
+              then let cat = drop 5 (showIdent (label2ident l))
+                   in ppTerm Unqualified 0 (R rms) <+> text "is not in the lincat of" <+> text cat <> 
+                      text "; try wrapping it with lin" <+> text cat
+              else text "cannot find value for label" <+> ppLabel l <+> text "in" <+> ppTerm Unqualified 0 (R rms)
+
+   checkCase arg val (p,t) = do
+     cont <- pattContext gr g arg p
+     t' <- justCheck (reverse cont ++ g) t val
+     return (p,t')
+
+pattContext :: SourceGrammar -> Context -> Type -> Patt -> Check Context
+pattContext env g typ p = case p of
+  PV x -> return [(Explicit,x,typ)]
+  PP (q,c) ps | q /= cPredef -> do ---- why this /=? AR 6/1/2006
+    t <- lookupResType env (q,c)
+    let (cont,v) = typeFormCnc t
+    checkCond (text "wrong number of arguments for constructor in" <+> ppPatt Unqualified 0 p) 
+              (length cont == length ps)
+    checkEqLType env g typ v (patt2term p)
+    mapM (\((_,_,ty),p) -> pattContext env g ty p) (zip cont ps) >>= return . concat
+  PR r -> do
+    typ' <- computeLType env g typ
+    case typ' of
+      RecType t -> do
+        let pts = [(ty,tr) | (l,tr) <- r, Just ty <- [lookup l t]]
+        ----- checkWarn $ prt p ++++ show pts ----- debug
+        mapM (uncurry (pattContext env g)) pts >>= return . concat
+      _ -> checkError (text "record type expected for pattern instead of" <+> ppTerm Unqualified 0 typ')
+  PT t p' -> do
+    checkEqLType env g typ t (patt2term p')
+    pattContext env g typ p'
+
+  PAs x p -> do
+    g' <- pattContext env g typ p
+    return ((Explicit,x,typ):g')
+
+  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 
+      (text "incompatible bindings of" <+>
+       fsep (map ppIdent pts) <+> 
+       text "in pattern alterantives" <+> ppPatt Unqualified 0 p) (null pts) 
+    return g1 -- must be g1 == g2
+  PSeq p q -> do
+    g1 <- pattContext env g typ p
+    g2 <- pattContext env g typ q
+    return $ g1 ++ g2
+  PRep p' -> noBind typeStr p'
+  PNeg p' -> noBind typ p'
+
+  _ -> return [] ---- check types!
+ where 
+   noBind typ p' = do
+    co <- pattContext env g typ p'
+    if not (null co)
+      then checkWarn (text "no variable bound inside pattern" <+> ppPatt Unqualified 0 p) 
+           >> return []
+      else return []
+
+checkEqLType :: SourceGrammar -> Context -> Type -> Type -> Term -> Check Type
+checkEqLType gr g t u trm = do
+  (b,t',u',s) <- checkIfEqLType gr g t u trm
+  case b of
+    True  -> return t'
+    False -> checkError $ text s <+> text "type of" <+> ppTerm Unqualified 0 trm $$
+                          text "expected:" <+> ppType t $$
+                          text "inferred:" <+> ppType u
+
+checkIfEqLType :: SourceGrammar -> Context -> Type -> Type -> Term -> Check (Bool,Type,Type,String)
+checkIfEqLType gr g t u trm = do
+  t' <- computeLType gr g t
+  u' <- computeLType gr g u
+  case t' == u' || alpha [] t' u' of
+    True -> return (True,t',u',[])
+    -- forgive missing lock fields by only generating a warning.
+    --- better: use a flag to forgive? (AR 31/1/2006)
+    _ -> case missingLock [] t' u' of
+      Ok lo -> do
+        checkWarn $ text "missing lock field" <+> fsep (map ppLabel lo)
+        return (True,t',u',[])
+      Bad s -> return (False,t',u',s)
+
+  where
+
+   -- t is a subtype of u 
+   --- quick hack version of TC.eqVal
+   alpha g t u = case (t,u) of  
+
+     -- error (the empty type!) is subtype of any other type
+     (_,u) | u == typeError -> True
+
+     -- contravariance
+     (Prod _ x a b, Prod _ y c d) -> alpha g c a && alpha ((x,y):g) b d 
+                              
+     -- record subtyping
+     (RecType rs, RecType ts) -> all (\ (l,a) -> 
+                                   any (\ (k,b) -> alpha g a b && l == k) ts) rs
+     (ExtR r s, ExtR r' s') -> alpha g r r' && alpha g s s'
+     (ExtR r s, t) -> alpha g r t || alpha g s t
+
+     -- the following say that Ints n is a subset of Int and of Ints m >= n
+     (t,u) | Just m <- isTypeInts t, Just n <- isTypeInts t -> m >= n
+           | Just _ <- isTypeInts t, u == typeInt           -> True ---- check size!
+           | t == typeInt,           Just _ <- isTypeInts u -> True ---- why this ???? AR 11/12/2005
+
+     ---- this should be made in Rename
+     (Q  (m,a), Q  (n,b)) | a == b -> elem m (allExtendsPlus gr n) 
+                                   || elem n (allExtendsPlus gr m)
+                                   || m == n --- for Predef
+     (QC (m,a), QC (n,b)) | a == b -> elem m (allExtendsPlus gr n) 
+                                   || elem n (allExtendsPlus gr m)
+     (QC (m,a), Q  (n,b)) | a == b -> elem m (allExtendsPlus gr n) 
+                                   || elem n (allExtendsPlus gr m)
+     (Q  (m,a), QC (n,b)) | a == b -> elem m (allExtendsPlus gr n) 
+                                   || elem n (allExtendsPlus gr m)
+
+     (Table a b,  Table c d)  -> alpha g a c && alpha g b d
+     (Vr x,       Vr y)       -> x == y || elem (x,y) g || elem (y,x) g
+     _                        -> t == u 
+     --- the following should be one-way coercions only. AR 4/1/2001
+                                  || elem t sTypes && elem u sTypes
+                                  || (t == typeType && u == typePType) 
+                                  || (u == typeType && t == typePType) 
+
+   missingLock g t u = case (t,u) of  
+     (RecType rs, RecType ts) -> 
+       let 
+         ls = [l | (l,a) <- rs, 
+                   not (any (\ (k,b) -> alpha g a b && l == k) ts)]
+         (locks,others) = partition isLockLabel ls
+       in case others of
+         _:_ -> Bad $ render (text "missing record fields:" <+> fsep (punctuate comma (map ppLabel others)))
+         _ -> return locks
+     -- contravariance
+     (Prod _ x a b, Prod _ y c d) -> do
+        ls1 <- missingLock g c a
+        ls2 <- missingLock g b d
+        return $ ls1 ++ ls2
+
+     _ -> Bad ""
+
+   sTypes = [typeStr, typeTok, typeString]
+
+-- auxiliaries
+
+-- | light-weight substitution for dep. types
+substituteLType :: Context -> Type -> Check Type
+substituteLType g t = case t of
+  Vr x -> return $ maybe t id $ lookup x [(x,t) | (_,x,t) <- g]
+  _ -> composOp (substituteLType g) t
+
+termWith :: Term -> Check Type -> Check (Term, Type)
+termWith t ct = do
+  ty <- ct
+  return (t,ty)
+
+-- | compositional check\/infer of binary operations
+check2 :: (Term -> Check Term) -> (Term -> Term -> Term) -> 
+          Term -> Term -> Type -> Check (Term,Type)
+check2 chk con a b t = do
+  a' <- chk a
+  b' <- chk b
+  return (con a' b', t)
+
+-- printing a type with a lock field lock_C as C
+ppType :: Type -> Doc
+ppType ty =
+  case ty of
+    RecType fs   -> case filter isLockLabel $ map fst fs of
+                      [lock] -> text (drop 5 (showIdent (label2ident lock)))
+                      _      -> ppTerm Unqualified 0 ty
+    Prod _ x a b -> ppType a <+> text "->" <+> ppType b
+    _            -> ppTerm Unqualified 0 ty
+
+checkLookup :: Ident -> Context -> Check Type
+checkLookup x g =
+  case [ty | (b,y,ty) <- g, x == y] of
+    []     -> checkError (text "unknown variable" <+> ppIdent x)
+    (ty:_) -> return ty
+-}

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

@@ -0,0 +1,792 @@
+module GF.Compile.TypeCheck.ConcreteNew( checkLType, inferLType ) where
+
+-- The code here is based on the paper:
+-- Simon Peyton Jones, Dimitrios Vytiniotis, Stephanie Weirich.
+-- Practical type inference for arbitrary-rank types.
+-- 14 September 2011
+
+import GF.Grammar hiding (Env, VGen, VApp, VRecType)
+import GF.Grammar.Lookup
+import GF.Grammar.Predef
+import GF.Grammar.Lockfield
+import GF.Compile.Compute.ConcreteNew
+import GF.Compile.Compute.Predef(predef,predefName)
+import GF.Infra.CheckM
+import GF.Data.Operations
+import Control.Applicative(Applicative(..))
+import Control.Monad(ap,liftM,mplus)
+import GF.Text.Pretty
+import Data.List (nub, (\\), tails)
+import qualified Data.IntMap as IntMap
+import Data.Maybe(fromMaybe,isNothing)
+
+checkLType :: GlobalEnv -> Term -> Type -> Check (Term, Type)
+checkLType ge t ty = runTcM $ do
+  vty <- liftErr (eval ge [] ty)
+  (t,_) <- tcRho ge [] t (Just vty)
+  t <- zonkTerm t
+  return (t,ty)
+
+inferLType :: GlobalEnv -> Term -> Check (Term, Type)
+inferLType ge t = runTcM $ do
+  (t,ty) <- inferSigma ge [] t
+  t  <- zonkTerm t
+  ty <- zonkTerm =<< tc_value2term (geLoc ge) [] ty
+  return (t,ty)
+
+inferSigma :: GlobalEnv -> Scope -> Term -> TcM (Term,Sigma)
+inferSigma ge scope t = do                                      -- GEN1
+  (t,ty) <- tcRho ge scope t Nothing
+  env_tvs <- getMetaVars (geLoc ge) (scopeTypes scope)
+  res_tvs <- getMetaVars (geLoc ge) [(scope,ty)]
+  let forall_tvs = res_tvs \\ env_tvs
+  quantify ge scope t forall_tvs ty
+
+Just vtypeInt   = fmap (flip VApp []) (predef cInt)
+Just vtypeFloat = fmap (flip VApp []) (predef cFloat)
+Just vtypeInts  = fmap (\p i -> VApp p [VInt i]) (predef cInts)
+vtypeStr   = VSort cStr
+vtypeStrs  = VSort cStrs
+vtypeType  = VSort cType
+vtypePType = VSort cPType
+
+tcRho :: GlobalEnv -> Scope -> Term -> Maybe Rho -> TcM (Term, Rho)
+tcRho ge scope t@(EInt i)   mb_ty = instSigma ge scope t (vtypeInts i) mb_ty -- INT
+tcRho ge scope t@(EFloat _) mb_ty = instSigma ge scope t vtypeFloat mb_ty    -- FLOAT
+tcRho ge scope t@(K _)      mb_ty = instSigma ge scope t vtypeStr   mb_ty    -- STR
+tcRho ge scope t@(Empty)    mb_ty = instSigma ge scope t vtypeStr   mb_ty
+tcRho ge scope t@(Vr v)     mb_ty = do                          -- VAR
+  case lookup v scope of
+    Just v_sigma -> instSigma ge scope t v_sigma mb_ty
+    Nothing      -> tcError ("Unknown variable" <+> v)
+tcRho ge scope t@(Q id)     mb_ty =
+  runTcA (tcOverloadFailed t) $
+    tcApp ge scope t `bindTcA` \(t,ty) ->
+      instSigma ge scope t ty mb_ty
+tcRho ge scope t@(QC id)    mb_ty =
+  runTcA (tcOverloadFailed t) $
+    tcApp ge scope t `bindTcA` \(t,ty) ->
+      instSigma ge scope t ty mb_ty
+tcRho ge scope t@(App fun arg) mb_ty = do
+  runTcA (tcOverloadFailed t) $
+    tcApp ge scope t `bindTcA` \(t,ty) ->
+      instSigma ge scope t ty mb_ty
+tcRho ge scope (Abs bt var body) Nothing = do                   -- ABS1
+  i <- newMeta scope vtypeType
+  let arg_ty = VMeta i (scopeEnv scope) []
+  (body,body_ty) <- tcRho ge ((var,arg_ty):scope) body Nothing
+  return (Abs bt var body, (VProd bt arg_ty identW (Bind (const body_ty))))
+tcRho ge scope t@(Abs Implicit var body) (Just ty) = do         -- ABS2
+  (bt, var_ty, body_ty) <- unifyFun ge scope ty
+  if bt == Implicit
+    then return ()
+    else tcError (ppTerm Unqualified 0 t <+> "is an implicit function, but no implicit function is expected")
+  (body, body_ty) <- tcRho ge ((var,var_ty):scope) body (Just (body_ty (VGen (length scope) [])))
+  return (Abs Implicit var body,ty)
+tcRho ge scope (Abs Explicit var body) (Just ty) = do           -- ABS3
+  (scope,f,ty') <- skolemise ge scope ty
+  (_,var_ty,body_ty) <- unifyFun ge scope ty'
+  (body, body_ty) <- tcRho ge ((var,var_ty):scope) body (Just (body_ty (VGen (length scope) [])))
+  return (f (Abs Explicit var body),ty)
+tcRho ge scope (Let (var, (mb_ann_ty, rhs)) body) mb_ty = do    -- LET
+  (rhs,var_ty) <- case mb_ann_ty of
+                    Nothing     -> inferSigma ge scope rhs
+                    Just ann_ty -> do (ann_ty, _) <- tcRho ge scope ann_ty (Just vtypeType)
+                                      v_ann_ty <- liftErr (eval ge (scopeEnv scope) ann_ty)
+                                      (rhs,_) <- tcRho ge scope rhs (Just v_ann_ty)
+                                      return (rhs, v_ann_ty)
+  (body, body_ty) <- tcRho ge ((var,var_ty):scope) body mb_ty
+  var_ty <- tc_value2term (geLoc ge) (scopeVars scope) var_ty
+  return (Let (var, (Just var_ty, rhs)) body, body_ty)
+tcRho ge scope (Typed body ann_ty) mb_ty = do                   -- ANNOT
+  (ann_ty, _) <- tcRho ge scope ann_ty (Just vtypeType)
+  v_ann_ty <- liftErr (eval ge (scopeEnv scope) ann_ty)
+  (body,_) <- tcRho ge scope body (Just v_ann_ty)
+  instSigma ge scope (Typed body ann_ty) v_ann_ty mb_ty
+tcRho ge scope (FV ts) mb_ty = do
+  case ts of
+    []     -> do i <- newMeta scope vtypeType
+                 instSigma ge scope (FV []) (VMeta i (scopeEnv scope) []) mb_ty
+    (t:ts) -> do (t,ty) <- tcRho ge scope t mb_ty
+
+                 let go []     ty = return ([],ty)
+                     go (t:ts) ty = do (t, ty) <- tcRho ge scope t (Just ty)
+                                       (ts,ty) <- go ts ty
+                                       return (t:ts,ty)
+
+                 (ts,ty) <- go ts ty
+                 return (FV (t:ts), ty)
+tcRho ge scope t@(Sort s) mb_ty = do
+  instSigma ge scope t vtypeType mb_ty
+tcRho ge scope t@(RecType rs) Nothing   = do
+  (rs,mb_ty) <- tcRecTypeFields ge scope rs Nothing
+  return (RecType rs,fromMaybe vtypePType mb_ty)
+tcRho ge scope t@(RecType rs) (Just ty) = do
+  (scope,f,ty') <- skolemise ge scope ty
+  case ty' of
+    VSort s
+      | s == cType  -> return ()
+      | s == cPType -> return ()
+    VMeta i env vs  -> case rs of
+                         [] -> unifyVar ge scope i env vs vtypePType
+                         _  -> return ()
+    ty              -> do ty <- zonkTerm =<< tc_value2term (geLoc ge) (scopeVars scope) ty
+                          tcError ("The record type" <+> ppTerm Unqualified 0 t $$ 
+                                   "cannot be of type" <+> ppTerm Unqualified 0 ty)
+  (rs,mb_ty) <- tcRecTypeFields ge scope rs (Just ty')
+  return (f (RecType rs),ty)
+tcRho ge scope t@(Table p res) mb_ty = do
+  (p,  p_ty)   <- tcRho ge scope p   (Just vtypePType)
+  (res,res_ty) <- tcRho ge scope res (Just vtypeType)
+  instSigma ge scope (Table p res) vtypeType mb_ty
+tcRho ge scope (Prod bt x ty1 ty2) mb_ty = do
+  (ty1,ty1_ty) <- tcRho ge scope ty1 (Just vtypeType)
+  vty1 <- liftErr (eval ge (scopeEnv scope) ty1)
+  (ty2,ty2_ty) <- tcRho ge ((x,vty1):scope) ty2 (Just vtypeType)
+  instSigma ge scope (Prod bt x ty1 ty2) vtypeType mb_ty
+tcRho ge scope (S t p) mb_ty = do
+  p_ty   <- fmap (\i -> VMeta i (scopeEnv scope) []) $ newMeta scope vtypePType
+  res_ty <- case mb_ty of
+              Nothing -> fmap (\i -> VMeta i (scopeEnv scope) []) $ newMeta scope vtypeType
+              Just ty -> return ty
+  let t_ty = VTblType p_ty res_ty
+  (t,t_ty) <- tcRho ge scope t (Just t_ty)
+  (p,_) <- tcRho ge scope p (Just p_ty)
+  return (S t p, res_ty)
+tcRho ge scope (T tt ps) Nothing = do                           -- ABS1/AABS1 for tables
+  p_ty   <- case tt of
+              TRaw      -> fmap (\i -> VMeta i (scopeEnv scope) []) $ newMeta scope vtypePType
+              TTyped ty -> do (ty, _) <- tcRho ge scope ty (Just vtypeType)
+                              liftErr (eval ge (scopeEnv scope) ty)
+  (ps,mb_res_ty) <- tcCases ge scope ps p_ty Nothing
+  res_ty <- case mb_res_ty of
+              Just res_ty -> return res_ty
+              Nothing     -> fmap (\i -> VMeta i (scopeEnv scope) []) $ newMeta scope vtypeType
+  p_ty_t <- tc_value2term (geLoc ge) [] p_ty
+  return (T (TTyped p_ty_t) ps, VTblType p_ty res_ty)
+tcRho ge scope (T tt ps) (Just ty) = do                         -- ABS2/AABS2 for tables
+  (scope,f,ty') <- skolemise ge scope ty
+  (p_ty, res_ty) <- unifyTbl ge scope ty'
+  case tt of
+    TRaw      -> return ()
+    TTyped ty -> do (ty, _) <- tcRho ge scope ty (Just vtypeType)
+                    return ()--subsCheckRho ge scope -> Term ty res_ty
+  (ps,Just res_ty) <- tcCases ge scope ps p_ty (Just res_ty)
+  p_ty_t <- tc_value2term (geLoc ge) [] p_ty
+  return (f (T (TTyped p_ty_t) ps), VTblType p_ty res_ty)
+tcRho ge scope (R rs) Nothing = do
+  lttys <- inferRecFields ge scope rs
+  rs <- mapM (\(l,t,ty) -> tc_value2term (geLoc ge) (scopeVars scope) ty >>= \ty -> return (l, (Just ty, t))) lttys
+  return (R        rs,
+          VRecType [(l, ty) | (l,t,ty) <- lttys]
+         )
+tcRho ge scope (R rs) (Just ty) = do
+  (scope,f,ty') <- skolemise ge scope ty
+  case ty' of
+    (VRecType ltys) -> do lttys <- checkRecFields ge scope rs ltys
+                          rs <- mapM (\(l,t,ty) -> tc_value2term (geLoc ge) (scopeVars scope) ty >>= \ty -> return (l, (Just ty, t))) lttys
+                          return ((f . R)  rs, 
+                                  VRecType [(l, ty) | (l,t,ty) <- lttys]
+                                 )
+    ty              -> do lttys <- inferRecFields ge scope rs
+                          t <- liftM (f . R) (mapM (\(l,t,ty) -> tc_value2term (geLoc ge) (scopeVars scope) ty >>= \ty -> return (l, (Just ty, t))) lttys)
+                          let ty' = VRecType [(l, ty) | (l,t,ty) <- lttys]
+                          t <- subsCheckRho ge scope t ty' ty
+                          return (t, ty')
+tcRho ge scope (P t l) mb_ty = do
+  l_ty   <- case mb_ty of
+              Just ty -> return ty
+              Nothing -> do i <- newMeta scope vtypeType
+                            return (VMeta i (scopeEnv scope) [])
+  (t,t_ty) <- tcRho ge scope t (Just (VRecType [(l,l_ty)]))
+  return (P t l,l_ty)
+tcRho ge scope (C t1 t2) mb_ty = do
+  (t1,t1_ty) <- tcRho ge scope t1 (Just vtypeStr)
+  (t2,t2_ty) <- tcRho ge scope t2 (Just vtypeStr)
+  instSigma ge scope (C t1 t2) vtypeStr mb_ty
+tcRho ge scope (Glue t1 t2) mb_ty = do
+  (t1,t1_ty) <- tcRho ge scope t1 (Just vtypeStr)
+  (t2,t2_ty) <- tcRho ge scope t2 (Just vtypeStr)
+  instSigma ge scope (Glue t1 t2) vtypeStr mb_ty
+tcRho ge scope t@(ExtR t1 t2) mb_ty = do
+  (t1,t1_ty) <- tcRho ge scope t1 Nothing
+  (t2,t2_ty) <- tcRho ge scope t2 Nothing
+  case (t1_ty,t2_ty) of
+    (VSort s1,VSort s2)
+       | (s1 == cType || s1 == cPType) &&
+         (s2 == cType || s2 == cPType) -> let sort | s1 == cPType && s2 == cPType = cPType
+                                                   | otherwise                    = cType
+                                          in instSigma ge scope (ExtR t1 t2) (VSort sort) mb_ty
+    (VRecType rs1, VRecType rs2)       -> instSigma ge scope (ExtR t1 t2) (VRecType (rs2++rs1)) mb_ty
+    _                                  -> tcError ("Cannot type check" <+> ppTerm Unqualified 0 t)
+tcRho ge scope (ELin cat t) mb_ty = do  -- this could be done earlier, i.e. in the parser
+  tcRho ge scope (ExtR t (R [(lockLabel cat,(Just (RecType []),R []))])) mb_ty
+tcRho ge scope (ELincat cat t) mb_ty = do  -- this could be done earlier, i.e. in the parser
+  tcRho ge scope (ExtR t (RecType [(lockLabel cat,RecType [])])) mb_ty
+tcRho ge scope (Alts t ss) mb_ty = do
+  (t,_) <- tcRho ge scope t (Just vtypeStr)
+  ss    <- flip mapM ss $ \(t1,t2) -> do
+              (t1,_) <- tcRho ge scope t1 (Just vtypeStr)
+              (t2,_) <- tcRho ge scope t2 (Just vtypeStrs)
+              return (t1,t2)
+  instSigma ge scope (Alts t ss) vtypeStr mb_ty
+tcRho ge scope (Strs ss) mb_ty = do
+  ss <- flip mapM ss $ \t -> do
+           (t,_) <- tcRho ge scope t (Just vtypeStr)
+           return t
+  instSigma ge scope (Strs ss) vtypeStrs mb_ty
+tcRho ge scope (EPattType ty) mb_ty = do
+  (ty, _) <- tcRho ge scope ty (Just vtypeType)
+  instSigma ge scope (EPattType ty) vtypeType mb_ty
+tcRho ge scope t@(EPatt p) mb_ty = do
+  (scope,f,ty) <- case mb_ty of
+                    Nothing -> do i <- newMeta scope vtypeType
+                                  return (scope,id,VMeta i (scopeEnv scope) [])
+                    Just ty -> do (scope,f,ty) <- skolemise ge scope ty
+                                  case ty of
+                                    VPattType ty -> return (scope,f,ty)
+                                    _            -> tcError (ppTerm Unqualified 0 t <+> "must be of pattern type but" <+> ppTerm Unqualified 0 t <+> "is expected")
+  tcPatt ge scope p ty
+  return (f (EPatt p), ty)
+tcRho gr scope t _ = unimplemented ("tcRho "++show t)
+
+tcCases ge scope []         p_ty mb_res_ty = return ([],mb_res_ty)
+tcCases ge scope ((p,t):cs) p_ty mb_res_ty = do
+  scope' <- tcPatt ge scope p p_ty
+  (t,res_ty)     <- tcRho ge scope' t mb_res_ty
+  (cs,mb_res_ty) <- tcCases ge scope cs p_ty (Just res_ty)
+  return ((p,t):cs,mb_res_ty)
+
+
+tcApp ge scope t@(App fun (ImplArg arg)) = do                   -- APP1
+  tcApp ge scope fun `bindTcA` \(fun,fun_ty) ->
+     do (bt, arg_ty, res_ty) <- unifyFun ge scope fun_ty
+        if (bt == Implicit)
+          then return ()
+          else tcError (ppTerm Unqualified 0 t <+> "is an implicit argument application, but no implicit argument is expected")
+        (arg,_) <- tcRho ge scope arg (Just arg_ty)
+        varg <- liftErr (eval ge (scopeEnv scope) arg)
+        return (App fun (ImplArg arg), res_ty varg)
+tcApp ge scope (App fun arg) =                                  -- APP2
+  tcApp ge scope fun `bindTcA` \(fun,fun_ty) ->
+     do (fun,fun_ty) <- instantiate scope fun fun_ty
+        (_, arg_ty, res_ty) <- unifyFun ge scope fun_ty
+        (arg,_) <- tcRho ge scope arg (Just arg_ty)
+        varg <- liftErr (eval ge (scopeEnv scope) arg)
+        return (App fun arg, res_ty varg)
+tcApp ge scope (Q id) =                                          -- VAR (global)
+  mkTcA (lookupOverloadTypes (geGrammar ge) id) `bindTcA` \(t,ty) -> 
+     do ty <- liftErr (eval ge [] ty)
+        return (t,ty)
+tcApp ge scope (QC id) =                                         -- VAR (global)
+  mkTcA (lookupOverloadTypes (geGrammar ge) id) `bindTcA` \(t,ty) -> 
+     do ty <- liftErr (eval ge [] ty)
+        return (t,ty)
+tcApp ge scope t =
+  singleTcA (tcRho ge scope t Nothing)
+
+
+tcOverloadFailed t ttys =
+  tcError ("Overload resolution failed" $$
+           "of term   " <+> pp t $$
+           "with types" <+> vcat [ppTerm Terse 0 ty | (_,ty) <- ttys])
+
+
+tcPatt ge scope PW        ty0 =
+  return scope
+tcPatt ge scope (PV x)    ty0 =
+  return ((x,ty0):scope)
+tcPatt ge scope (PP c ps) ty0 =
+  case lookupResType (geGrammar ge) c of
+    Ok ty  -> do let go scope ty []     = return (scope,ty)
+                     go scope ty (p:ps) = do (_,arg_ty,res_ty) <- unifyFun ge scope ty
+                                             scope <- tcPatt ge scope p arg_ty
+                                             go scope (res_ty (VGen (length scope) [])) ps
+                 vty <- liftErr (eval ge [] ty)
+                 (scope,ty) <- go scope vty ps
+                 unify ge scope ty0 ty
+                 return scope
+    Bad err -> tcError (pp err)
+tcPatt ge scope (PInt i) ty0 = do
+  subsCheckRho ge scope (EInt i) (vtypeInts i) ty0
+  return scope
+tcPatt ge scope (PString s) ty0 = do
+  unify ge scope ty0 vtypeStr
+  return scope
+tcPatt ge scope PChar ty0 = do
+  unify ge scope ty0 vtypeStr
+  return scope
+tcPatt ge scope (PSeq p1 p2) ty0 = do
+  unify ge scope ty0 vtypeStr
+  scope <- tcPatt ge scope p1 vtypeStr
+  scope <- tcPatt ge scope p2 vtypeStr
+  return scope
+tcPatt ge scope (PAs x p) ty0 = do
+  tcPatt ge ((x,ty0):scope) p ty0
+tcPatt ge scope (PR rs) ty0 = do
+  let mk_ltys  []            = return []
+      mk_ltys  ((l,p):rs)    = do i <- newMeta scope vtypePType
+                                  ltys <- mk_ltys rs
+                                  return ((l,p,VMeta i (scopeEnv scope) []) : ltys)
+      go scope []            = return scope
+      go scope ((l,p,ty):rs) = do scope <- tcPatt ge scope p ty
+                                  go scope rs
+  ltys <- mk_ltys rs
+  subsCheckRho ge scope (EPatt (PR rs)) (VRecType [(l,ty) | (l,p,ty) <- ltys]) ty0
+  go scope ltys
+tcPatt ge scope (PAlt p1 p2) ty0 = do
+  tcPatt ge scope p1 ty0
+  tcPatt ge scope p2 ty0
+  return scope
+tcPatt ge scope (PM q) ty0 = do
+  case lookupResType (geGrammar ge) q of
+    Ok (EPattType ty)
+            -> do vty <- liftErr (eval ge [] ty)
+                  unify ge scope ty0 vty
+                  return scope
+    Ok ty   -> tcError ("Pattern type expected but " <+> pp ty <+> " found.")
+    Bad err -> tcError (pp err)
+tcPatt ge scope p ty = unimplemented ("tcPatt "++show p)
+
+inferRecFields ge scope rs = 
+  mapM (\(l,r) -> tcRecField ge scope l r Nothing) rs
+
+checkRecFields ge scope []          ltys
+  | null ltys                            = return []
+  | otherwise                            = tcError ("Missing fields:" <+> hsep (map fst ltys))
+checkRecFields ge scope ((l,t):lts) ltys =
+  case takeIt l ltys of
+    (Just ty,ltys) -> do ltty  <- tcRecField ge scope l t (Just ty)
+                         lttys <- checkRecFields ge scope lts ltys
+                         return (ltty : lttys)
+    (Nothing,ltys) -> do tcWarn ("Discarded field:" <+> l)
+                         ltty  <- tcRecField ge scope l t Nothing
+                         lttys <- checkRecFields ge scope lts ltys
+                         return lttys     -- ignore the field
+  where
+    takeIt l1 []  = (Nothing, [])
+    takeIt l1 (lty@(l2,ty):ltys)
+      | l1 == l2  = (Just ty,ltys) 
+      | otherwise = let (mb_ty,ltys') = takeIt l1 ltys
+                    in (mb_ty,lty:ltys')
+
+tcRecField ge scope l (mb_ann_ty,t) mb_ty = do
+  (t,ty) <- case mb_ann_ty of
+              Just ann_ty -> do (ann_ty, _) <- tcRho ge scope ann_ty (Just vtypeType)
+                                v_ann_ty <- liftErr (eval ge (scopeEnv scope) ann_ty)
+                                (t,_) <- tcRho ge scope t (Just v_ann_ty)
+                                instSigma ge scope t v_ann_ty mb_ty
+              Nothing     -> tcRho ge scope t mb_ty
+  return (l,t,ty)
+
+tcRecTypeFields ge scope []          mb_ty = return ([],mb_ty)
+tcRecTypeFields ge scope ((l,ty):rs) mb_ty = do
+  (ty,sort) <- tcRho ge scope ty mb_ty
+  mb_ty <- case sort of
+             VSort s
+               | s == cType  -> return (Just sort)
+               | s == cPType -> return mb_ty
+             VMeta _ _ _     -> return mb_ty
+             _               -> do sort <- zonkTerm =<< tc_value2term (geLoc ge) (scopeVars scope) sort
+                                   tcError ("The record type field" <+> l <+> ':' <+> ppTerm Unqualified 0 ty $$ 
+                                            "cannot be of type" <+> ppTerm Unqualified 0 sort)
+  (rs,mb_ty) <- tcRecTypeFields ge scope rs mb_ty
+  return ((l,ty):rs,mb_ty)
+
+-- | Invariant: if the third argument is (Just rho),
+-- 	            then rho is in weak-prenex form
+instSigma :: GlobalEnv -> Scope -> Term -> Sigma -> Maybe Rho -> TcM (Term, Rho)
+instSigma ge scope t ty1 Nothing    = return (t,ty1)           -- INST1
+instSigma ge scope t ty1 (Just ty2) = do                       -- INST2
+  t <- subsCheckRho ge scope t ty1 ty2
+  return (t,ty2)
+
+-- | Invariant: the second argument is in weak-prenex form
+subsCheckRho :: GlobalEnv -> Scope -> Term -> Sigma -> Rho -> TcM Term
+subsCheckRho ge scope t ty1@(VMeta i env vs) ty2 = do
+  mv <- getMeta i
+  case mv of
+    Unbound _ _ -> do unify ge scope ty1 ty2
+                      return t
+    Bound ty1   -> do vty1 <- liftErr (eval ge env ty1)
+                      subsCheckRho ge scope t (vapply (geLoc ge) vty1 vs) ty2
+subsCheckRho ge scope t ty1 ty2@(VMeta i env vs) = do
+  mv <- getMeta i
+  case mv of
+    Unbound _ _ -> do unify ge scope ty1 ty2
+                      return t
+    Bound ty2   -> do vty2 <- liftErr (eval ge env ty2)
+                      subsCheckRho ge scope t ty1 (vapply (geLoc ge) vty2 vs)
+subsCheckRho ge scope t (VProd Implicit ty1 x (Bind ty2)) rho2 = do     -- Rule SPEC
+  i <- newMeta scope ty1
+  subsCheckRho ge scope (App t (ImplArg (Meta i))) (ty2 (VMeta i [] [])) rho2
+subsCheckRho ge scope t rho1 (VProd Implicit ty1 x (Bind ty2)) = do     -- Rule SKOL
+  let v = newVar scope
+  t <- subsCheckRho ge ((v,ty1):scope) t rho1 (ty2 (VGen (length scope) []))
+  return (Abs Implicit v t)
+subsCheckRho ge scope t rho1 (VProd Explicit a2 _ (Bind r2)) = do       -- Rule FUN
+  (_,a1,r1) <- unifyFun ge scope rho1
+  subsCheckFun ge scope t a1 r1 a2 r2
+subsCheckRho ge scope t (VProd Explicit a1 _ (Bind r1)) rho2 = do       -- Rule FUN
+  (bt,a2,r2) <- unifyFun ge scope rho2
+  subsCheckFun ge scope t a1 r1 a2 r2
+subsCheckRho ge scope t rho1 (VTblType p2 r2) = do                      -- Rule TABLE
+  (p1,r1) <- unifyTbl ge scope rho1
+  subsCheckTbl ge scope t p1 r1 p2 r2
+subsCheckRho ge scope t (VTblType p1 r1) rho2 = do                      -- Rule TABLE
+  (p2,r2) <- unifyTbl ge scope rho2
+  subsCheckTbl ge scope t p1 r1 p2 r2
+subsCheckRho ge scope t (VSort s1) (VSort s2)                           -- Rule PTYPE
+  | s1 == cPType && s2 == cType = return t
+subsCheckRho ge scope t (VApp p1 _) (VApp p2 _)                         -- Rule INT1
+  | predefName p1 == cInts && predefName p2 == cInt = return t
+subsCheckRho ge scope t (VApp p1 [VInt i]) (VApp p2 [VInt j])           -- Rule INT2
+  | predefName p1 == cInts && predefName p2 == cInts =
+      if i <= j 
+        then return t
+        else tcError ("Ints" <+> i <+> "is not a subtype of" <+> "Ints" <+> j)
+subsCheckRho ge scope t ty1@(VRecType rs1) ty2@(VRecType rs2) = do      -- Rule REC
+  let mkAccess scope t = 
+        case t of
+          ExtR t1 t2 -> do (scope,mkProj1,mkWrap1) <- mkAccess scope t1
+                           (scope,mkProj2,mkWrap2) <- mkAccess scope t2
+                           return (scope
+                                  ,\l -> mkProj2 l `mplus` mkProj1 l
+                                  ,mkWrap1 . mkWrap2
+                                  )
+          R rs -> do sequence_ [tcWarn ("Discarded field:" <+> l) | (l,_) <- rs, isNothing (lookup l rs2)]
+                     return (scope
+                            ,\l -> lookup l rs
+                            ,id
+                            )
+          Vr x -> do return (scope
+                            ,\l -> do VRecType rs <- lookup x scope
+                                      ty <- lookup l rs
+                                      return (Nothing,P t l)
+                            ,id
+                            )
+          t    -> let x = newVar scope
+                  in return (((x,ty1):scope)
+                            ,\l  -> return (Nothing,P (Vr x) l)
+                            ,Let (x, (Nothing, t))
+                            )
+
+      mkField scope l (mb_ty,t) ty1 ty2 = do
+        t <- subsCheckRho ge scope t ty1 ty2
+        return (l, (mb_ty,t))
+
+  (scope,mkProj,mkWrap) <- mkAccess scope t
+
+  let fields = [(l,ty2,lookup l rs1) | (l,ty2) <- rs2]
+  case [l | (l,_,Nothing) <- fields] of
+    []      -> return ()
+    missing -> tcError ("In the term" <+> pp t $$
+                        "there are no values for fields:" <+> hsep missing)
+  rs <- sequence [mkField scope l t ty1 ty2 | (l,ty2,Just ty1) <- fields, Just t <- [mkProj l]]
+  return (mkWrap (R rs))
+subsCheckRho ge scope t tau1 tau2 = do                                  -- Rule EQ
+  unify ge scope tau1 tau2                                 -- Revert to ordinary unification
+  return t
+
+subsCheckFun :: GlobalEnv -> Scope -> Term -> Sigma -> (Value -> Rho) -> Sigma -> (Value -> Rho) -> TcM Term
+subsCheckFun ge scope t a1 r1 a2 r2 = do
+  let v   = newVar scope
+  vt <- subsCheckRho ge ((v,a2):scope) (Vr v) a2 a1
+  val1 <- liftErr (eval ge (scopeEnv ((v,vtypeType):scope)) vt)
+  val2 <- return  (VGen (length scope) [])
+  t  <- subsCheckRho ge ((v,vtypeType):scope) (App t vt) (r1 val1) (r2 val2)
+  return (Abs Explicit v t)
+
+subsCheckTbl :: GlobalEnv -> Scope -> Term -> Sigma -> Rho -> Sigma -> Rho -> TcM Term
+subsCheckTbl ge scope t p1 r1 p2 r2 = do
+  let x = newVar scope
+  xt <- subsCheckRho ge scope (Vr x) p2 p1
+  t  <- subsCheckRho ge ((x,vtypePType):scope) (S t xt) r1 r2 ;
+  p2 <- tc_value2term (geLoc ge) (scopeVars scope) p2
+  return (T (TTyped p2) [(PV x,t)])
+
+-----------------------------------------------------------------------
+-- Unification
+-----------------------------------------------------------------------
+
+unifyFun :: GlobalEnv -> Scope -> Rho -> TcM (BindType, Sigma, Value -> Rho)
+unifyFun ge scope (VProd bt arg x (Bind res)) =
+  return (bt,arg,res)
+unifyFun ge scope tau = do
+  let mk_val ty = VMeta ty [] []
+  arg <- fmap mk_val $ newMeta scope vtypeType
+  res <- fmap mk_val $ newMeta scope vtypeType
+  let bt = Explicit
+  unify ge scope tau (VProd bt arg identW (Bind (const res)))
+  return (bt,arg,const res)
+
+unifyTbl :: GlobalEnv -> Scope -> Rho -> TcM (Sigma, Rho)
+unifyTbl ge scope (VTblType arg res) =
+  return (arg,res)
+unifyTbl ge scope tau = do
+  let mk_val ty = VMeta ty (scopeEnv scope) []
+  arg <- fmap mk_val $ newMeta scope vtypePType
+  res <- fmap mk_val $ newMeta scope vtypeType
+  unify ge scope tau (VTblType arg res)
+  return (arg,res)
+
+unify ge scope (VApp f1 vs1)      (VApp f2 vs2)
+  | f1 == f2                   = sequence_ (zipWith (unify ge scope) vs1 vs2)
+unify ge scope (VCApp f1 vs1)     (VCApp f2 vs2)
+  | f1 == f2                   = sequence_ (zipWith (unify ge scope) vs1 vs2)
+unify ge scope (VSort s1)         (VSort s2)
+  | s1 == s2                   = return ()
+unify ge scope (VGen i vs1)       (VGen j vs2)
+  | i == j                     = sequence_ (zipWith (unify ge scope) vs1 vs2)
+unify ge scope (VTblType p1 res1) (VTblType p2 res2) = do
+  unify ge scope p1   p2
+  unify ge scope res1 res2
+unify ge scope (VMeta i env1 vs1) (VMeta j env2 vs2)
+  | i  == j                    = sequence_ (zipWith (unify ge scope) vs1 vs2)
+  | otherwise                  = do mv <- getMeta j
+                                    case mv of
+                                      Bound t2    -> do v2 <- liftErr (eval ge env2 t2)
+                                                        unify ge scope (VMeta i env1 vs1) (vapply (geLoc ge) v2 vs2)
+                                      Unbound _ _ -> setMeta i (Bound (Meta j))
+unify ge scope (VInt i)       (VInt j)
+  | i == j                     = return ()
+unify ge scope (VMeta i env vs) v = unifyVar ge scope i env vs v
+unify ge scope v (VMeta i env vs) = unifyVar ge scope i env vs v
+unify ge scope v1 v2 = do
+  t1 <- zonkTerm =<< tc_value2term (geLoc ge) (scopeVars scope) v1
+  t2 <- zonkTerm =<< tc_value2term (geLoc ge) (scopeVars scope) v2
+  tcError ("Cannot unify terms:" <+> (ppTerm Unqualified 0 t1 $$ 
+                                      ppTerm Unqualified 0 t2))
+
+-- | Invariant: tv1 is a flexible type variable
+unifyVar :: GlobalEnv -> Scope -> MetaId -> Env -> [Value] -> Tau -> TcM ()
+unifyVar ge scope i env vs ty2 = do            -- Check whether i is bound
+  mv <- getMeta i
+  case mv of
+    Bound ty1       -> do v <- liftErr (eval ge env ty1)
+                          unify ge scope (vapply (geLoc ge) v vs) ty2
+    Unbound scope' _ -> case value2term (geLoc ge) (scopeVars scope') ty2 of
+                          Left i     -> let (v,_) = reverse scope !! i
+                                        in tcError ("Variable" <+> pp v <+> "has escaped")
+                          Right ty2' -> do ms2 <- getMetaVars (geLoc ge) [(scope,ty2)]
+                                           if i `elem` ms2
+                                             then tcError ("Occurs check for" <+> ppMeta i <+> "in:" $$
+                                                           nest 2 (ppTerm Unqualified 0 ty2'))
+                                             else setMeta i (Bound ty2')
+
+-----------------------------------------------------------------------
+-- Instantiation and quantification
+-----------------------------------------------------------------------
+
+-- | Instantiate the topmost implicit arguments with metavariables
+instantiate :: Scope -> Term -> Sigma -> TcM (Term,Rho)
+instantiate scope t (VProd Implicit ty1 x (Bind ty2)) = do
+  i <- newMeta scope ty1
+  instantiate scope (App t (ImplArg (Meta i))) (ty2 (VMeta i [] []))
+instantiate scope t ty = do
+  return (t,ty)
+
+-- | Build fresh lambda abstractions for the topmost implicit arguments
+skolemise :: GlobalEnv -> Scope -> Sigma -> TcM (Scope, Term->Term, Rho)
+skolemise ge scope ty@(VMeta i env vs) = do
+  mv <- getMeta i
+  case mv of
+    Unbound _ _ -> return (scope,id,ty)                   -- guarded constant?
+    Bound ty    -> do vty <- liftErr (eval ge env ty)
+                      skolemise ge scope (vapply (geLoc ge) vty vs)
+skolemise ge scope (VProd Implicit ty1 x (Bind ty2)) = do
+  let v = newVar scope
+  (scope,f,ty2) <- skolemise ge ((v,ty1):scope) (ty2 (VGen (length scope) []))
+  return (scope,Abs Implicit v . f,ty2)
+skolemise ge scope ty = do
+  return (scope,id,ty)
+
+-- | Quantify over the specified type variables (all flexible)
+quantify :: GlobalEnv -> Scope -> Term -> [MetaId] -> Rho -> TcM (Term,Sigma)
+quantify ge scope t tvs ty0 = do
+  ty <- tc_value2term (geLoc ge) (scopeVars scope) ty0
+  let used_bndrs = nub (bndrs ty)  -- Avoid quantified type variables in use
+      new_bndrs  = take (length tvs) (allBinders \\ used_bndrs)
+  mapM_ bind (tvs `zip` new_bndrs)   -- 'bind' is just a cunning way 
+  ty <- zonkTerm ty                  -- of doing the substitution
+  vty <- liftErr (eval ge [] (foldr (\v ty -> Prod Implicit v typeType ty) ty new_bndrs))
+  return (foldr (Abs Implicit) t new_bndrs,vty)
+  where
+    bind (i, name) = setMeta i (Bound (Vr name))
+
+    bndrs (Prod _ x t1 t2) = [x] ++ bndrs t1  ++ bndrs t2
+    bndrs _                = []
+
+allBinders :: [Ident]    -- a,b,..z, a1, b1,... z1, a2, b2,... 
+allBinders = [ identS [x]          | x <- ['a'..'z'] ] ++
+             [ identS (x : show i) | i <- [1 :: Integer ..], x <- ['a'..'z']]
+
+
+-----------------------------------------------------------------------
+-- The Monad
+-----------------------------------------------------------------------
+
+type Scope = [(Ident,Value)]
+
+type Sigma = Value
+type Rho   = Value	-- No top-level ForAll
+type Tau   = Value	-- No ForAlls anywhere
+
+data MetaValue
+  = Unbound Scope Sigma
+  | Bound   Term
+type MetaStore = IntMap.IntMap MetaValue
+data TcResult a
+  = TcOk   a MetaStore [Message]
+  | TcFail             [Message] -- First msg is error, the rest are warnings?
+newtype TcM a = TcM {unTcM :: MetaStore -> [Message] -> TcResult a}
+
+instance Monad TcM where
+  return x = TcM (\ms msgs -> TcOk x ms msgs)
+  f >>= g  = TcM (\ms msgs -> case unTcM f ms msgs of
+                                TcOk x ms msgs -> unTcM (g x) ms msgs
+                                TcFail    msgs -> TcFail msgs)
+  fail     = tcError . pp
+
+instance Applicative TcM where
+  pure = return
+  (<*>) = ap
+
+instance Functor TcM where
+  fmap f g = TcM (\ms msgs -> case unTcM g ms msgs of
+                           TcOk x ms msgs -> TcOk (f x) ms msgs
+                           TcFail msgs    -> TcFail msgs)
+
+instance ErrorMonad TcM where
+  raise  = tcError . pp
+  handle f g = TcM (\ms msgs -> case unTcM f ms msgs of
+                                  TcFail (msg:msgs) -> unTcM (g (render msg)) ms msgs
+                                  r                 -> r)
+
+tcError :: Message -> TcM a
+tcError msg = TcM (\ms msgs -> TcFail (msg : msgs))
+
+tcWarn :: Message -> TcM ()
+tcWarn msg = TcM (\ms msgs -> TcOk () ms (msg : msgs))
+
+unimplemented str = fail ("Unimplemented: "++str)
+
+
+runTcM :: TcM a -> Check a
+runTcM f = case unTcM f IntMap.empty [] of
+             TcOk x _ msgs -> do checkWarnings msgs; return x
+             TcFail (msg:msgs) -> do checkWarnings msgs; checkError msg
+
+newMeta :: Scope -> Sigma -> TcM MetaId
+newMeta scope ty = TcM (\ms msgs -> 
+  let i = IntMap.size ms
+  in TcOk i (IntMap.insert i (Unbound scope ty) ms) msgs)
+
+getMeta :: MetaId -> TcM MetaValue
+getMeta i = TcM (\ms msgs -> 
+  case IntMap.lookup i ms of
+    Just mv -> TcOk mv ms msgs
+    Nothing -> TcFail (("Unknown metavariable" <+> ppMeta i) : msgs))
+
+setMeta :: MetaId -> MetaValue -> TcM ()
+setMeta i mv = TcM (\ms msgs -> TcOk () (IntMap.insert i mv ms) msgs)
+
+newVar :: Scope -> Ident
+newVar scope = head [x | i <- [1..], 
+                         let x = identS ('v':show i),
+                         isFree scope x]
+  where
+    isFree []            x = True
+    isFree ((y,_):scope) x = x /= y && isFree scope x
+
+scopeEnv   scope = zipWith (\(x,ty) i -> (x,VGen i [])) (reverse scope) [0..]
+scopeVars  scope = map fst scope
+scopeTypes scope = zipWith (\(_,ty) scope -> (scope,ty)) scope (tails scope)
+
+-- | This function takes account of zonking, and returns a set
+-- (no duplicates) of unbound meta-type variables
+getMetaVars :: GLocation -> [(Scope,Sigma)] -> TcM [MetaId]
+getMetaVars loc sc_tys = do
+  tys <- mapM (\(scope,ty) -> zonkTerm =<< tc_value2term loc (scopeVars scope) ty) sc_tys
+  return (foldr go [] tys)
+  where
+    -- Get the MetaIds from a term; no duplicates in result
+    go (Vr tv)    acc = acc 
+    go (App x y)  acc = go x (go y acc)
+    go (Meta i)   acc
+	  | i `elem` acc  = acc
+	  | otherwise	  = i : acc
+    go (Q _)      acc = acc
+    go (QC _)     acc = acc
+    go (Sort _)   acc = acc
+    go (Prod _ _ arg res) acc = go arg (go res acc)
+    go (Table p t) acc = go p (go t acc)
+    go (RecType rs) acc = foldl (\acc (l,ty) -> go ty acc) acc rs
+    go t acc = unimplemented ("go "++show t)
+
+-- | This function takes account of zonking, and returns a set
+-- (no duplicates) of free type variables
+getFreeVars :: GLocation -> [(Scope,Sigma)] -> TcM [Ident]
+getFreeVars loc sc_tys = do
+  tys <- mapM (\(scope,ty) -> zonkTerm =<< tc_value2term loc (scopeVars scope) ty) sc_tys
+  return (foldr (go []) [] tys)
+  where
+    go bound (Vr tv)            acc 
+	  | tv `elem` bound             = acc
+	  | tv `elem` acc               = acc
+	  | otherwise                   = tv : acc
+    go bound (App x y)          acc = go bound x (go bound y acc)
+    go bound (Meta _)           acc = acc
+    go bound (Q _)              acc = acc
+    go bound (QC _)             acc = acc
+    go bound (Prod _ x arg res) acc = go bound arg (go (x : bound) res acc)
+    go bound (RecType rs) acc = foldl (\acc (l,ty) -> go bound ty acc) acc rs
+    go bound (Table p t)        acc = go bound p (go bound t acc)
+
+-- | Eliminate any substitutions in a term
+zonkTerm :: Term -> TcM Term
+zonkTerm (Meta i) = do
+  mv <- getMeta i
+  case mv of
+    Unbound _ _ -> return (Meta i)
+    Bound t     -> do t <- zonkTerm t
+                      setMeta i (Bound t)       -- "Short out" multiple hops
+                      return t
+zonkTerm t = composOp zonkTerm t
+
+tc_value2term loc xs v =
+  case value2term loc xs v of
+    Left i  -> tcError ("Variable #" <+> pp i <+> "has escaped")
+    Right t -> return t
+
+
+
+data TcA x a 
+  = TcSingle   (MetaStore -> [Message] -> TcResult a)
+  | TcMany [x] (MetaStore -> [Message] -> [(a,MetaStore,[Message])])
+
+mkTcA :: Err [a] -> TcA a a
+mkTcA f = case f of
+            Bad msg -> TcSingle  (\ms msgs -> TcFail (pp msg : msgs))
+            Ok  [x] -> TcSingle  (\ms msgs -> TcOk x ms msgs)
+            Ok  xs  -> TcMany xs (\ms msgs -> [(x,ms,msgs) | x <- xs])
+
+singleTcA :: TcM a -> TcA x a
+singleTcA = TcSingle . unTcM
+
+bindTcA :: TcA x a -> (a -> TcM b) -> TcA x b
+bindTcA f g = case f of
+                TcSingle  f -> TcSingle (unTcM (TcM f >>= g))
+                TcMany xs f -> TcMany xs (\ms msgs -> foldr add [] (f ms msgs))
+  where
+    add (y,ms,msgs) rs =
+      case unTcM (g y) ms msgs of
+        TcFail _       -> rs
+        TcOk y ms msgs -> (y,ms,msgs):rs
+
+runTcA :: ([x] -> TcM a) -> TcA x a -> TcM a
+runTcA g f = TcM (\ms msgs -> case f of
+                                TcMany xs f -> case f ms msgs of
+                                                 [(x,ms,msgs)] -> TcOk x ms msgs
+                                                 rs            -> unTcM (g xs) ms msgs
+                                TcSingle f                     -> f ms msgs)

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

@@ -0,0 +1,68 @@
+module GF.Compile.TypeCheck.Primitives where
+
+import GF.Grammar
+import GF.Grammar.Predef
+import qualified Data.Map as Map
+
+typPredefined :: Ident -> Maybe Type
+typPredefined f = case Map.lookup f primitives of
+                    Just (ResOper (Just (L _ ty)) _) -> Just ty
+                    Just (ResParam _ _)              -> Just typePType
+                    Just (ResValue (L _ ty) _)       -> Just ty
+                    _                                -> Nothing
+
+primitives = Map.fromList
+  [ (cErrorType, ResOper (Just (noLoc typeType)) Nothing)
+  , (cInt      , ResOper (Just (noLoc typePType)) Nothing)
+  , (cFloat    , ResOper (Just (noLoc typePType)) Nothing)
+  , (cInts     , fun [typeInt] typePType)
+  , (cPBool    , ResParam (Just (noLoc [(cPTrue,[],0),(cPFalse,[],1)])) (Just [QC (cPredef,cPTrue), QC (cPredef,cPFalse)]))
+  , (cPTrue    , ResValue (noLoc typePBool) 0)
+  , (cPFalse   , ResValue (noLoc typePBool) 1)
+  , (cError    , fun [typeStr] typeError)  -- non-can. of empty set
+  , (cLength   , fun [typeTok] typeInt)
+  , (cDrop     , fun [typeInt,typeTok] typeTok)
+  , (cTake     , fun [typeInt,typeTok] typeTok)
+  , (cTk       , fun [typeInt,typeTok] typeTok)
+  , (cDp       , fun [typeInt,typeTok] typeTok)
+  , (cEqInt    , fun [typeInt,typeInt] typePBool)
+  , (cLessInt  , fun [typeInt,typeInt] typePBool)
+  , (cPlus     , fun [typeInt,typeInt] typeInt)
+  , (cEqStr    , fun [typeTok,typeTok] typePBool)
+  , (cOccur    , fun [typeTok,typeTok] typePBool)
+  , (cOccurs   , fun [typeTok,typeTok] typePBool)
+
+  , (cToUpper  , fun [typeTok] typeTok)
+  , (cToLower  , fun [typeTok] typeTok)
+  , (cIsUpper  , fun [typeTok] typePBool)
+
+----  "read"   -> 
+  , (cRead     , ResOper (Just (noLoc (mkProd -- (P : Type) -> Tok -> P
+                                         [(Explicit,varP,typePType),(Explicit,identW,typeStr)] (Vr varP) []))) Nothing)
+  , (cShow     , ResOper (Just (noLoc (mkProd -- (P : PType) -> P -> Tok
+                                         [(Explicit,varP,typePType),(Explicit,identW,Vr varP)] typeStr []))) Nothing)
+  , (cEqVal    , ResOper (Just (noLoc (mkProd -- (P : PType) -> P -> P -> PBool
+                                         [(Explicit,varP,typePType),(Explicit,identW,Vr varP),(Explicit,identW,Vr varP)] typePBool []))) Nothing)
+  , (cToStr    , ResOper (Just (noLoc (mkProd -- (L : Type)  -> L -> Str
+                                         [(Explicit,varL,typeType),(Explicit,identW,Vr varL)] typeStr []))) Nothing)
+  , (cMapStr   , ResOper (Just (noLoc (mkProd -- (L : Type)  -> (Str -> Str) -> L -> L
+                                         [(Explicit,varL,typeType),(Explicit,identW,mkFunType [typeStr] typeStr),(Explicit,identW,Vr varL)] (Vr varL) []))) Nothing)
+  , (cNonExist , ResOper (Just (noLoc (mkProd -- Str
+                                         [] typeStr []))) Nothing)
+  , (cBIND     , ResOper (Just (noLoc (mkProd -- Str
+                                         [] typeStr []))) Nothing)
+  , (cSOFT_BIND, ResOper (Just (noLoc (mkProd -- Str
+                                         [] typeStr []))) Nothing)
+  , (cSOFT_SPACE,ResOper (Just (noLoc (mkProd -- Str
+                                         [] typeStr []))) Nothing)
+  , (cCAPIT    , ResOper (Just (noLoc (mkProd -- Str
+                                         [] typeStr []))) Nothing)
+  , (cALL_CAPIT, ResOper (Just (noLoc (mkProd -- Str
+                                         [] typeStr []))) Nothing)
+  ]
+  where
+    fun from to = oper (mkFunType from to)
+    oper ty     = ResOper (Just (noLoc ty)) Nothing
+
+    varL = identS "L"
+    varP = identS "P"

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

@@ -0,0 +1,761 @@
+{-# LANGUAGE PatternGuards #-}
+module GF.Compile.TypeCheck.RConcrete( checkLType, inferLType, computeLType, ppType ) where
+
+import GF.Infra.CheckM
+import GF.Data.Operations
+
+import GF.Grammar
+import GF.Grammar.Lookup
+import GF.Grammar.Predef
+import GF.Grammar.PatternMatch
+import GF.Grammar.Lockfield (isLockLabel, lockRecType, unlockRecord)
+import GF.Compile.TypeCheck.Primitives
+
+import Data.List
+import Control.Monad
+import GF.Text.Pretty
+
+computeLType :: SourceGrammar -> Context -> Type -> Check Type
+computeLType gr g0 t = comp (reverse [(b,x, Vr x) | (b,x,_) <- g0] ++ g0) t
+ where
+  comp g ty = case ty of
+    _ | Just _ <- isTypeInts ty -> return ty ---- shouldn't be needed
+      | isPredefConstant ty     -> return ty ---- shouldn't be needed
+
+    Q (m,ident) -> checkIn ("module" <+> m) $ do
+      ty' <- lookupResDef gr (m,ident)
+      if ty' == ty then return ty else comp g ty' --- is this necessary to test?
+
+    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) 
+
+    Vr ident  -> checkLookup ident g -- never needed to compute!
+
+    App f a -> do
+      f' <- comp g f
+      a' <- comp g a
+      case f' of
+        Abs b x t -> comp ((b,x,a'):g) t
+        _ -> return $ App f' a'
+
+    Prod bt x a b -> do
+      a' <- comp g a
+      b' <- comp ((bt,x,Vr x) : g) b
+      return $ Prod bt x a' b'
+
+    Abs bt x b -> do
+      b' <- comp ((bt,x,Vr x):g) b
+      return $ Abs bt x b'
+
+    Let (x,(_,a)) b -> comp ((Explicit,x,a):g) b
+
+    ExtR r s -> do
+      r' <- comp g r
+      s' <- comp g s
+      case (r',s') of
+        (RecType rs, RecType ss) -> plusRecType r' s' >>= comp g
+        _ -> return $ ExtR r' s'
+
+    RecType fs -> do
+      let fs' = sortRec fs
+      liftM RecType $ mapPairsM (comp g) fs'
+
+    ELincat c t -> do
+      t' <- comp g t
+      lockRecType c t' ---- locking to be removed AR 20/6/2009
+
+    _ | ty == typeTok -> return typeStr
+    _ | isPredefConstant ty -> return ty
+
+    _ -> composOp (comp g) ty
+
+-- the underlying algorithms
+
+inferLType :: SourceGrammar -> Context -> Term -> Check (Term, Type)
+inferLType gr g trm = case trm of
+
+   Q (m,ident) | isPredef m -> termWith trm $ case typPredefined ident of
+                                                Just ty -> return ty
+                                                Nothing -> checkError ("unknown in Predef:" <+> ident)
+
+   Q ident -> checks [
+     termWith trm $ lookupResType gr ident >>= computeLType gr g
+     ,
+     lookupResDef gr ident >>= inferLType gr g
+     ,
+     checkError ("cannot infer type of constant" <+> ppTerm Unqualified 0 trm)
+     ]
+
+   QC (m,ident) | isPredef m -> termWith trm $ case typPredefined ident of
+                                                 Just ty -> return ty
+                                                 Nothing -> checkError ("unknown in Predef:" <+> ident)
+
+   QC ident -> checks [
+       termWith trm $ lookupResType gr ident >>= computeLType gr g
+       ,
+       lookupResDef gr ident >>= inferLType gr g
+       ,
+       checkError ("cannot infer type of canonical constant" <+> ppTerm Unqualified 0 trm)
+       ]
+
+   Vr ident -> termWith trm $ checkLookup ident g
+
+   Typed e t -> do
+     t' <- computeLType gr g t
+     checkLType gr g e t'
+
+   AdHocOverload ts -> do
+     over <- getOverload gr g Nothing trm
+     case over of
+       Just trty -> return trty
+       _ -> checkError ("unresolved overloading of constants" <+> ppTerm Qualified 0 trm) 
+
+   App f a -> do
+     over <- getOverload gr g Nothing trm
+     case over of
+       Just trty -> return trty
+       _ -> do
+         (f',fty) <- inferLType gr g f
+         fty' <- computeLType gr g fty
+         case fty' of
+           Prod bt z arg val -> do 
+             a' <- justCheck g a arg
+             ty <- if isWildIdent z 
+                      then return val
+                      else substituteLType [(bt,z,a')] val
+             return (App f' a',ty) 
+           _ -> checkError ("A function type is expected for" <+> ppTerm Unqualified 0 f <+> "instead of type" <+> ppType fty)
+
+   S f x -> do
+     (f', fty) <- inferLType gr g f
+     case fty of
+       Table arg val -> do
+         x'<- justCheck g x arg
+         return (S f' x', val)
+       _ -> checkError ("table lintype expected for the table in" $$ nest 2 (ppTerm Unqualified 0 trm))
+
+   P t i -> do
+     (t',ty) <- inferLType gr g t   --- ??
+     ty' <- computeLType gr g ty
+     let tr2 = P t' i
+     termWith tr2 $ case ty' of
+       RecType ts -> case lookup i ts of
+                       Nothing -> checkError ("unknown label" <+> i <+> "in" $$ nest 2 (ppTerm Unqualified 0 ty'))
+                       Just x  -> return x
+       _          -> checkError ("record type expected for:" <+> ppTerm Unqualified 0 t $$
+                                 " instead of the inferred:" <+> ppTerm Unqualified 0 ty')
+
+   R r -> do
+     let (ls,fs) = unzip r
+     fsts <- mapM inferM fs
+     let ts = [ty | (Just ty,_) <- fsts]
+     checkCond ("cannot infer type of record" $$ nest 2 (ppTerm Unqualified 0 trm)) (length ts == length fsts)
+     return $ (R (zip ls fsts), RecType (zip ls ts))
+
+   T (TTyped arg) pts -> do
+     (_,val) <- checks $ map (inferCase (Just arg)) pts
+     checkLType gr g trm (Table arg val)
+   T (TComp arg) pts -> do
+     (_,val) <- checks $ map (inferCase (Just arg)) pts
+     checkLType gr g trm (Table arg val)
+   T ti pts -> do  -- tries to guess: good in oper type inference
+     let pts' = [pt | pt@(p,_) <- pts, isConstPatt p]
+     case pts' of 
+       [] -> checkError ("cannot infer table type of" <+> ppTerm Unqualified 0 trm)
+----       PInt k : _ -> return $ Ints $ max [i | PInt i <- pts'] 
+       _  -> do 
+         (arg,val) <- checks $ map (inferCase Nothing) pts'
+         checkLType gr g trm (Table arg val)
+   V arg pts -> do
+     (_,val) <- checks $ map (inferLType gr g) pts
+--   return (trm, Table arg val) -- old, caused issue 68
+     checkLType gr g trm (Table arg val)
+
+   K s  -> do
+     if elem ' ' s
+        then do
+          let ss = foldr C Empty (map K (words s))  
+          ----- removed irritating warning AR 24/5/2008
+          ----- checkWarn ("token \"" ++ s ++ 
+          -----              "\" converted to token list" ++ prt ss)
+          return (ss, typeStr)
+        else return (trm, typeStr)
+
+   EInt i -> return (trm, typeInt)
+
+   EFloat i -> return (trm, typeFloat)
+
+   Empty -> return (trm, typeStr)
+
+   C s1 s2 -> 
+     check2 (flip (justCheck g) typeStr) C s1 s2 typeStr
+
+   Glue s1 s2 -> 
+     check2 (flip (justCheck g) typeStr) Glue s1 s2 typeStr ---- typeTok
+
+---- 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))
+     inferLType gr g (head ts)
+
+   Strs ts -> do
+     ts' <- mapM (\t -> justCheck g t typeStr) ts 
+     return (Strs ts', typeStrs)
+
+   Alts t aa -> do
+     t'  <- justCheck g t typeStr
+     aa' <- flip mapM aa (\ (c,v) -> do
+        c' <- justCheck g c typeStr 
+        v' <- checks $ map (justCheck g v) [typeStrs, EPattType typeStr]
+        return (c',v'))
+     return (Alts t' aa', typeStr)
+
+   RecType r -> do
+     let (ls,ts) = unzip r
+     ts' <- mapM (flip (justCheck g) typeType) ts 
+     return (RecType (zip ls ts'), typeType)
+
+   ExtR r s -> do
+     (r',rT) <- inferLType gr g r 
+     rT'     <- computeLType gr g rT
+     (s',sT) <- inferLType gr g s
+     sT'     <- computeLType gr g sT
+
+     let trm' = ExtR r' s'
+     case (rT', sT') of
+       (RecType rs, RecType ss) -> do
+         let rt = RecType ([field | field@(l,_) <- rs, notElem l (map fst ss)] ++ ss) -- select types of later fields 
+         checkLType gr g trm' rt ---- return (trm', rt)
+       _ | rT' == typeType && sT' == typeType -> do
+         return (trm', typeType)
+       _ -> checkError ("records or record types expected in" <+> ppTerm Unqualified 0 trm)
+
+   Sort _     -> 
+     termWith trm $ return typeType
+
+   Prod bt x a b -> do
+     a' <- justCheck g a typeType
+     b' <- justCheck ((bt,x,a'):g) b typeType
+     return (Prod bt x a' b', typeType)
+
+   Table p t  -> do
+     p' <- justCheck g p typeType --- check p partype! 
+     t' <- justCheck g t typeType
+     return $ (Table p' t', typeType)
+
+   FV vs -> do
+     (_,ty) <- checks $ map (inferLType gr g) vs
+---     checkIfComplexVariantType trm ty
+     checkLType gr g trm ty
+
+   EPattType ty -> do
+     ty' <- justCheck g ty typeType
+     return (EPattType ty',typeType)
+   EPatt p -> do
+     ty <- inferPatt p
+     return (trm, EPattType ty)
+
+   ELin c trm -> do
+     (trm',ty) <- inferLType gr g trm
+     ty' <- lockRecType c ty ---- lookup c; remove lock AR 20/6/2009
+     return $ (ELin c trm', ty') 
+
+   _ -> checkError ("cannot infer lintype of" <+> ppTerm Unqualified 0 trm)
+
+ where
+   isPredef m = elem m [cPredef,cPredefAbs]
+
+   justCheck g ty te = checkLType gr g ty te >>= return . fst
+
+   -- for record fields, which may be typed
+   inferM (mty, t) = do
+     (t', ty') <- case mty of
+       Just ty -> checkLType gr g t ty
+       _ -> inferLType gr g t
+     return (Just ty',t')
+
+   inferCase mty (patt,term) = do
+     arg  <- maybe (inferPatt patt) return mty
+     cont <- pattContext gr g arg patt
+     (_,val) <- inferLType gr (reverse cont ++ g) term
+     return (arg,val)
+   isConstPatt p = case p of
+     PC _ ps -> True --- all isConstPatt ps
+     PP _ ps -> True --- all isConstPatt ps
+     PR ps -> all (isConstPatt . snd) ps
+     PT _ p -> isConstPatt p
+     PString _ -> True
+     PInt _ -> True
+     PFloat _ -> True
+     PChar -> True
+     PChars _ -> True
+     PSeq p q -> isConstPatt p && isConstPatt q
+     PAlt p q -> isConstPatt p && isConstPatt q
+     PRep p -> isConstPatt p
+     PNeg p -> isConstPatt p
+     PAs _ p -> isConstPatt p
+     _ -> False
+
+   inferPatt p = case p of
+     PP (q,c) ps | q /= cPredef -> liftM valTypeCnc (lookupResType gr (q,c))
+     PAs _ p  -> inferPatt p
+     PNeg p   -> inferPatt p
+     PAlt p q -> checks [inferPatt p, inferPatt q]
+     PSeq _ _ -> return $ typeStr
+     PRep _   -> return $ typeStr
+     PChar    -> return $ typeStr
+     PChars _ -> return $ typeStr
+     _ -> inferLType gr g (patt2term p) >>= return . snd
+
+-- type inference: Nothing, type checking: Just t
+-- the latter permits matching with value type
+getOverload :: SourceGrammar -> Context -> Maybe Type -> Term -> Check (Maybe (Term,Type))
+getOverload gr g mt ot = case appForm ot of
+     (f@(Q c), ts) -> case lookupOverload gr c of
+       Ok typs -> do
+         ttys <- mapM (inferLType gr g) ts
+         v <- matchOverload f typs ttys
+         return $ Just v
+       _ -> return Nothing
+     (AdHocOverload cs@(f:_), ts) -> do     --- the function name f is only used in error messages
+       let typs = concatMap collectOverloads cs
+       ttys <- mapM (inferLType gr g) ts
+       v <- matchOverload f typs ttys
+       return $ Just v
+     _ -> return Nothing
+
+ where
+   collectOverloads tr@(Q c) = case lookupOverload gr c of 
+     Ok typs -> typs
+     _ -> case lookupResType gr c of
+       Ok ty -> let (args,val) = typeFormCnc ty in [(map (\(b,x,t) -> t) args,(val,tr))]
+       _ -> []
+   collectOverloads _ = [] --- constructors QC
+
+   matchOverload f typs ttys = do
+     let (tts,tys) = unzip ttys
+     let vfs = lookupOverloadInstance tys typs
+     let matches = [vf | vf@((_,v,_),_) <- vfs, matchVal mt v]
+     let showTypes ty = hsep (map ppType ty)
+
+    
+     let (stys,styps) = (showTypes tys, [showTypes ty | (ty,_) <- typs])
+
+     -- to avoid strange error msg e.g. in case of unmatch record extension, show whole types if needed AR 28/1/2013
+     let (stysError,stypsError) = if elem (render stys) (map render styps)
+            then (hsep (map (ppTerm Unqualified 0) tys), [hsep (map (ppTerm Unqualified 0) ty) | (ty,_) <- typs])
+            else (stys,styps)
+
+     case ([vf | (vf,True) <- matches],[vf | (vf,False) <- matches]) of
+       ([(_,val,fun)],_) -> return (mkApp fun tts, val)
+       ([],[(pre,val,fun)]) -> do
+         checkWarn $  "ignoring lock fields in resolving" <+> ppTerm Unqualified 0 ot $$
+                      "for" $$
+                      nest 2 (showTypes tys) $$
+                      "using" $$
+                      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" $$
+                      nest 2 stysError $$
+                      "among alternatives" $$
+                      nest 2 (vcat stypsError) 
+
+
+       (vfs1,vfs2) -> case (noProds vfs1,noProds vfs2) of
+         ([(val,fun)],_) -> do
+           return (mkApp fun tts, val)
+         ([],[(val,fun)]) -> do
+           checkWarn ("ignoring lock fields in resolving" <+> ppTerm Unqualified 0 ot) 
+           return (mkApp fun tts, val)
+
+----- unsafely exclude irritating warning AR 24/5/2008
+-----           checkWarn $ "overloading of" +++ prt f +++ 
+-----             "resolved by excluding partial applications:" ++++
+-----             unlines [prtType env ty | (ty,_) <- vfs', not (noProd ty)]
+
+--- now forgiving ambiguity with a warning AR 1/2/2014
+--  This gives ad hoc overloading the same behaviour as the choice of the first match in renaming did before. 
+--  But it also gives a chance to ambiguous overloadings that were banned before. 
+         (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
+                 h:_ -> return h
+
+   matchVal mt v = elem mt [Nothing,Just v,Just (unlocked v)]
+
+   unlocked v = case v of
+     RecType fs -> RecType $ filter (not . isLockLabel . fst) fs
+     _ -> v
+   ---- TODO: accept subtypes
+   ---- TODO: use a trie
+   lookupOverloadInstance tys typs = 
+     [((pre,mkFunType rest val, t),isExact) | 
+       let lt = length tys,
+       (ty,(val,t)) <- typs, length ty >= lt,
+       let (pre,rest) = splitAt lt ty, 
+       let isExact = pre == tys,
+       isExact || map unlocked pre == map unlocked tys
+     ]
+
+   noProds vfs = [(v,f) | (_,v,f) <- vfs, noProd v]
+
+   noProd ty = case ty of
+     Prod _ _ _ _ -> False
+     _ -> True
+
+checkLType :: SourceGrammar -> Context -> Term -> Type -> Check (Term, Type)
+checkLType gr g trm typ0 = do
+  typ <- computeLType gr g typ0
+
+  case trm of
+
+    Abs bt x c -> do
+      case typ of
+        Prod bt' z a b -> do 
+          (c',b') <- if isWildIdent z
+                       then checkLType gr ((bt,x,a):g) c b
+                       else do b' <- checkIn (pp "abs") $ substituteLType [(bt',z,Vr x)] b
+                               checkLType gr ((bt,x,a):g) c b'
+          return $ (Abs bt x c', Prod bt' z a b')
+        _ -> checkError $ "function type expected instead of" <+> ppType typ
+
+    App f a -> do
+       over <- getOverload gr g (Just typ) trm
+       case over of
+         Just trty -> return trty
+         _ -> do
+          (trm',ty') <- inferLType gr g trm
+          termWith trm' $ checkEqLType gr g typ ty' trm'
+
+    AdHocOverload ts -> do
+      over <- getOverload gr g Nothing trm
+      case over of
+        Just trty -> return trty
+        _ -> checkError ("unresolved overloading of constants" <+> ppTerm Qualified 0 trm) 
+
+    Q _ -> do
+       over <- getOverload gr g (Just typ) trm
+       case over of
+         Just trty -> return trty
+         _ -> do
+          (trm',ty') <- inferLType gr g trm
+          termWith trm' $ checkEqLType gr g typ ty' trm'
+
+    T _ [] ->
+      checkError ("found empty table in type" <+> ppTerm Unqualified 0 typ)
+    T _ cs -> case typ of 
+      Table arg val -> do 
+        case allParamValues gr arg of
+          Ok vs -> do
+            let ps0 = map fst cs
+            ps <- testOvershadow ps0 vs
+            if null ps 
+              then return () 
+              else checkWarn ("patterns never reached:" $$
+                              nest 2 (vcat (map (ppPatt Unqualified 0) ps)))
+          _ -> return () -- happens with variable types
+        cs' <- mapM (checkCase arg val) cs
+        return (T (TTyped arg) cs', typ)
+      _ -> checkError $ "table type expected for table instead of" $$ nest 2 (ppType typ)
+    V arg0 vs ->
+      case typ of
+        Table arg1 val ->
+           do arg' <- checkEqLType gr g arg0 arg1 trm
+              vs1 <- allParamValues gr arg1
+              if length vs1 == length vs
+                 then return ()
+                 else checkError $ "wrong number of values in table" <+> ppTerm Unqualified 0 trm
+              vs' <- map fst `fmap` sequence [checkLType gr g v val|v<-vs]
+              return (V arg' vs',typ)
+
+    R r -> case typ of --- why needed? because inference may be too difficult
+       RecType rr -> do
+       --let (ls,_) = unzip rr        -- labels of expected type
+         fsts <- mapM (checkM r) rr   -- check that they are found in the record
+         return $ (R fsts, typ)       -- normalize record
+
+       _ -> checkError ("record type expected in type checking instead of" $$ nest 2 (ppTerm Unqualified 0 typ))
+
+    ExtR r s -> case typ of
+       _ | typ == typeType -> do
+         trm' <- computeLType gr g trm
+         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))
+
+       RecType rr -> do
+
+         ll2 <- case s of
+           R ss -> return $ map fst ss
+           _ -> do
+             (s',typ2) <- inferLType gr g s
+             case typ2 of
+               RecType ss -> return $ map fst ss
+               _ ->  checkError ("cannot get labels from" $$ nest 2 (ppTerm Unqualified 0 typ2))
+         let ll1 = [l | (l,_) <- rr, notElem l ll2]
+         (r',_) <- checkLType gr g r (RecType [field | field@(l,_) <- rr, elem l ll1])
+         (s',_) <- checkLType gr g s (RecType [field | field@(l,_) <- rr, elem l ll2])
+
+         let rec = R ([(l,(Nothing,P r' l)) | l <- ll1] ++ [(l,(Nothing,P s' l)) | l <- ll2])
+         return (rec, typ)
+
+       ExtR ty ex -> do
+         r' <- justCheck g r ty
+         s' <- justCheck g s ex
+         return $ (ExtR r' s', typ) --- is this all? it assumes the same division in trm and typ
+
+       _ -> checkError ("record extension not meaningful for" <+> ppTerm Unqualified 0 typ)
+
+    FV vs -> do
+      ttys <- mapM (flip (checkLType gr g) typ) vs
+---      checkIfComplexVariantType trm typ
+      return (FV (map fst ttys), typ) --- typ' ?
+
+    S tab arg -> checks [ do
+      (tab',ty) <- inferLType gr g tab
+      ty'       <- computeLType gr g ty
+      case ty' of
+        Table p t -> do
+          (arg',val) <- checkLType gr g arg p
+          checkEqLType gr g typ t trm
+          return (S tab' arg', t)
+        _ -> checkError ("table type expected for applied table instead of" <+> ppType ty')
+     , do
+      (arg',ty) <- inferLType gr g arg
+      ty'       <- computeLType gr g ty
+      (tab',_)  <- checkLType gr g tab (Table ty' typ)
+      return (S tab' arg', typ)
+      ]
+    Let (x,(mty,def)) body -> case mty of
+      Just ty -> do
+        (ty0,_)    <- checkLType gr g ty typeType
+        (def',ty') <- checkLType gr g def ty0
+        body' <- justCheck ((Explicit,x,ty'):g) body typ
+        return (Let (x,(Just ty',def')) body', typ)
+      _ -> do
+        (def',ty) <- inferLType gr g def  -- tries to infer type of local constant
+        checkLType gr g (Let (x,(Just ty,def')) body) typ
+
+    ELin c tr -> do
+      tr1 <- unlockRecord c tr
+      checkLType gr g tr1 typ
+
+    _ -> do
+      (trm',ty') <- inferLType gr g trm
+      termWith trm' $ checkEqLType gr g typ ty' trm'
+ where
+   justCheck g ty te = checkLType gr g ty te >>= return . fst
+{-
+   recParts rr t = (RecType rr1,RecType rr2) where 
+     (rr1,rr2) = partition (flip elem (map fst t) . fst) rr 
+-}
+   checkM rms (l,ty) = case lookup l rms of
+     Just (Just ty0,t) -> do
+       checkEqLType gr g ty ty0 t
+       (t',ty') <- checkLType gr g t ty
+       return (l,(Just ty',t'))
+     Just (_,t) -> do
+       (t',ty') <- checkLType gr g t ty
+       return (l,(Just ty',t'))
+     _ -> 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)
+
+   checkCase arg val (p,t) = do
+     cont <- pattContext gr g arg p
+     t' <- justCheck (reverse cont ++ g) t val
+     return (p,t')
+
+pattContext :: SourceGrammar -> Context -> Type -> Patt -> Check Context
+pattContext env g typ p = case p of
+  PV x -> return [(Explicit,x,typ)]
+  PP (q,c) ps | q /= cPredef -> do ---- why this /=? AR 6/1/2006
+    t <- lookupResType env (q,c)
+    let (cont,v) = typeFormCnc t
+    checkCond ("wrong number of arguments for constructor in" <+> ppPatt Unqualified 0 p) 
+              (length cont == length ps)
+    checkEqLType env g typ v (patt2term p)
+    mapM (\((_,_,ty),p) -> pattContext env g ty p) (zip cont ps) >>= return . concat
+  PR r -> do
+    typ' <- computeLType env g typ
+    case typ' of
+      RecType t -> do
+        let pts = [(ty,tr) | (l,tr) <- r, Just ty <- [lookup l t]]
+        ----- checkWarn $ prt p ++++ show pts ----- debug
+        mapM (uncurry (pattContext env g)) pts >>= return . concat
+      _ -> checkError ("record type expected for pattern instead of" <+> ppTerm Unqualified 0 typ')
+  PT t p' -> do
+    checkEqLType env g typ t (patt2term p')
+    pattContext env g typ p'
+
+  PAs x p -> do
+    g' <- pattContext env g typ p
+    return ((Explicit,x,typ):g')
+
+  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
+  PSeq p q -> do
+    g1 <- pattContext env g typ p
+    g2 <- pattContext env g typ q
+    return $ g1 ++ g2
+  PRep p' -> noBind typeStr p'
+  PNeg p' -> noBind typ p'
+
+  _ -> return [] ---- check types!
+ where 
+   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 []
+
+checkEqLType :: SourceGrammar -> Context -> Type -> Type -> Term -> Check Type
+checkEqLType gr g t u trm = do
+  (b,t',u',s) <- checkIfEqLType gr g t u trm
+  case b of
+    True  -> return t'
+    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)
+checkIfEqLType gr g t u trm = do
+  t' <- computeLType gr g t
+  u' <- computeLType gr g u
+  case t' == u' || alpha [] t' u' of
+    True -> return (True,t',u',[])
+    -- forgive missing lock fields by only generating a warning.
+    --- better: use a flag to forgive? (AR 31/1/2006)
+    _ -> case missingLock [] t' u' of
+      Ok lo -> do
+        checkWarn $ "missing lock field" <+> fsep lo
+        return (True,t',u',[])
+      Bad s -> return (False,t',u',s)
+
+  where
+
+   -- check that u is a subtype of t
+   --- quick hack version of TC.eqVal
+   alpha g t u = case (t,u) of  
+
+     -- error (the empty type!) is subtype of any other type
+     (_,u) | u == typeError -> True
+
+     -- contravariance
+     (Prod _ x a b, Prod _ y c d) -> alpha g c a && alpha ((x,y):g) b d 
+                              
+     -- record subtyping
+     (RecType rs, RecType ts) -> all (\ (l,a) -> 
+                                   any (\ (k,b) -> l == k && alpha g a b) ts) rs
+     (ExtR r s, ExtR r' s') -> alpha g r r' && alpha g s s'
+     (ExtR r s, t) -> alpha g r t || alpha g s t
+
+     -- the following say that Ints n is a subset of Int and of Ints m >= n
+     -- But why does it also allow Int as a subtype of Ints m? /TH 2014-04-04
+     (t,u) | Just m <- isTypeInts t, Just n <- isTypeInts u -> m >= n
+           | Just _ <- isTypeInts t, u == typeInt           -> True ---- check size!
+           | t == typeInt,           Just _ <- isTypeInts u -> True ---- why this ???? AR 11/12/2005
+
+     ---- this should be made in Rename
+     (Q  (m,a), Q  (n,b)) | a == b -> elem m (allExtendsPlus gr n) 
+                                   || elem n (allExtendsPlus gr m)
+                                   || m == n --- for Predef
+     (QC (m,a), QC (n,b)) | a == b -> elem m (allExtendsPlus gr n) 
+                                   || elem n (allExtendsPlus gr m)
+     (QC (m,a), Q  (n,b)) | a == b -> elem m (allExtendsPlus gr n) 
+                                   || elem n (allExtendsPlus gr m)
+     (Q  (m,a), QC (n,b)) | a == b -> elem m (allExtendsPlus gr n) 
+                                   || elem n (allExtendsPlus gr m)
+
+     -- contravariance
+     (Table a b,  Table c d)  -> alpha g c a && alpha g b d
+     (Vr x,       Vr y)       -> x == y || elem (x,y) g || elem (y,x) g
+     _                        -> t == u 
+     --- the following should be one-way coercions only. AR 4/1/2001
+                                  || elem t sTypes && elem u sTypes
+                                  || (t == typeType && u == typePType) 
+                                  || (u == typeType && t == typePType) 
+
+   missingLock g t u = case (t,u) of  
+     (RecType rs, RecType ts) -> 
+       let 
+         ls = [l | (l,a) <- rs, 
+                   not (any (\ (k,b) -> alpha g a b && l == k) ts)]
+         (locks,others) = partition isLockLabel ls
+       in case others of
+         _:_ -> Bad $ render ("missing record fields:" <+> fsep (punctuate ',' (others)))
+         _ -> return locks
+     -- contravariance
+     (Prod _ x a b, Prod _ y c d) -> do
+        ls1 <- missingLock g c a
+        ls2 <- missingLock g b d
+        return $ ls1 ++ ls2
+
+     _ -> Bad ""
+
+   sTypes = [typeStr, typeTok, typeString]
+
+-- auxiliaries
+
+-- | light-weight substitution for dep. types
+substituteLType :: Context -> Type -> Check Type
+substituteLType g t = case t of
+  Vr x -> return $ maybe t id $ lookup x [(x,t) | (_,x,t) <- g]
+  _ -> composOp (substituteLType g) t
+
+termWith :: Term -> Check Type -> Check (Term, Type)
+termWith t ct = do
+  ty <- ct
+  return (t,ty)
+
+-- | compositional check\/infer of binary operations
+check2 :: (Term -> Check Term) -> (Term -> Term -> Term) -> 
+          Term -> Term -> Type -> Check (Term,Type)
+check2 chk con a b t = do
+  a' <- chk a
+  b' <- chk b
+  return (con a' b', t)
+
+-- printing a type with a lock field lock_C as C
+ppType :: Type -> Doc
+ppType ty =
+  case ty of
+    RecType fs   -> case filter isLockLabel $ map fst fs of
+                      [lock] -> pp (drop 5 (showIdent (label2ident lock)))
+                      _      -> ppTerm Unqualified 0 ty
+    Prod _ x a b -> ppType a <+> "->" <+> ppType b
+    _            -> ppTerm Unqualified 0 ty
+{-
+ppqType :: Type -> Type -> Doc
+ppqType t u = case (ppType t, ppType u) of
+  (pt,pu) | render pt == render pu -> ppTerm Qualified 0 t
+  (pt,_) -> pt
+-}
+checkLookup :: Ident -> Context -> Check Type
+checkLookup x g =
+  case [ty | (b,y,ty) <- g, x == y] of
+    []     -> checkError ("unknown variable" <+> x)
+    (ty:_) -> return ty

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

@@ -5,22 +5,21 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/10/02 20:50:19 $
+-- > CVS $Date: 2005/10/02 20:50:19 $ 
 -- > CVS $Author: aarne $
 -- > CVS $Revision: 1.11 $
 --
 -- Thierry Coquand's type checking algorithm that creates a trace
 -----------------------------------------------------------------------------
 
-module GF.Compile.TypeCheck.TC (
-    AExp(..),
-    Theory,
-    checkExp,
-    inferExp,
-    checkBranch,
-    eqVal,
-    whnf
-  ) where
+module GF.Compile.TypeCheck.TC (AExp(..),
+	   Theory,
+	   checkExp,
+	   inferExp,
+	   checkBranch,
+	   eqVal,
+	   whnf
+	  ) where
 
 import GF.Data.Operations
 import GF.Grammar
@@ -32,17 +31,17 @@ import Data.Maybe
 import GF.Text.Pretty
 
 data AExp =
-     AVr   Ident Val
+     AVr   Ident Val 
    | ACn   QIdent Val
-   | AType
-   | AInt  Integer
+   | AType 
+   | AInt  Int 
    | AFloat Double
    | AStr  String
    | AMeta MetaId Val
    | ALet  (Ident,(Val,AExp)) AExp
-   | AApp  AExp AExp Val
-   | AAbs  Ident Val AExp
-   | AProd Ident AExp AExp
+   | AApp  AExp AExp Val 
+   | AAbs  Ident Val AExp 
+   | AProd Ident AExp AExp 
 -- -- | AEqs  [([Exp],AExp)] --- not used
    | ARecType [ALabelling]
    | AR    [AAssign]
@@ -51,7 +50,7 @@ data AExp =
    | AData Val
   deriving (Eq,Show)
 
-type ALabelling = (Label, AExp)
+type ALabelling = (Label, AExp) 
 type AAssign = (Label, (Val, AExp))
 
 type Theory = QIdent -> Err Val
@@ -72,7 +71,7 @@ whnf :: Val -> Err Val
 whnf v = ---- errIn ("whnf" +++ prt v) $ ---- debug
          case v of
   VApp u w -> do
-    u' <- whnf u
+    u' <- whnf u 
     w' <- whnf w
     app u' w'
   VClos env e -> eval env e
@@ -82,9 +81,9 @@ app :: Val -> Val -> Err Val
 app u v = case u of
   VClos env (Abs _ x e) -> eval ((x,v):env) e
   _ -> return $ VApp u v
-
+  
 eval :: Env -> Term -> Err Val
-eval env e = ---- errIn ("eval" +++ prt e +++ "in" +++ prEnv env) $
+eval env e = ---- errIn ("eval" +++ prt e +++ "in" +++ prEnv env) $ 
              case e of
   Vr x    -> lookupVar env x
   Q c   -> return $ VCn c
@@ -96,23 +95,23 @@ eval env e = ---- errIn ("eval" +++ prt e +++ "in" +++ prEnv env) $
   _ -> return $ VClos env e
 
 eqVal :: Int -> Val -> Val -> Err [(Val,Val)]
-eqVal k u1 u2 = ---- errIn (prt u1 +++ "<>" +++ prBracket (show k) +++ prt u2) $
+eqVal k u1 u2 = ---- errIn (prt u1 +++ "<>" +++ prBracket (show k) +++ prt u2) $ 
                 do
   w1 <- whnf u1
-  w2 <- whnf u2
+  w2 <- whnf u2 
   let v = VGen k
   case (w1,w2) of
     (VApp f1 a1, VApp f2 a2) -> liftM2 (++) (eqVal k f1 f2) (eqVal k a1 a2)
     (VClos env1 (Abs _ x1 e1), VClos env2 (Abs _ x2 e2)) ->
       eqVal (k+1) (VClos ((x1,v x1):env1) e1) (VClos ((x2,v x1):env2) e2)
     (VClos env1 (Prod _ x1 a1 e1), VClos env2 (Prod _ x2 a2 e2)) ->
-      liftM2 (++)
+      liftM2 (++) 
         (eqVal k     (VClos            env1  a1) (VClos            env2  a2))
         (eqVal (k+1) (VClos ((x1,v x1):env1) e1) (VClos ((x2,v x1):env2) e2))
     (VGen i _, VGen j _) -> return [(w1,w2) | i /= j]
-    (VCn (_, i), VCn (_,j)) -> return [(w1,w2) | i /= j]
+    (VCn (_, i), VCn (_,j)) -> return [(w1,w2) | i /= j] 
     --- thus ignore qualifications; valid because inheritance cannot
-    --- be qualified. Simplifies annotation. AR 17/3/2005
+    --- be qualified. Simplifies annotation. AR 17/3/2005 
     _ -> return [(w1,w2) | w1 /= w2]
 -- invariant: constraints are in whnf
 
@@ -128,10 +127,10 @@ checkExp th tenv@(k,rho,gamma) e ty = do
 
     Abs _ x t -> case typ of
       VClos env (Prod _ y a b) -> do
-                           a' <- whnf $ VClos env a ---
-                           (t',cs) <- checkExp th
-                                          (k+1,(x,v x):rho, (x,a'):gamma) t (VClos ((y,v x):env) b)
-                           return (AAbs x a' t', cs)
+	a' <- whnf $ VClos env a ---
+	(t',cs) <- checkExp th 
+                           (k+1,(x,v x):rho, (x,a'):gamma) t (VClos ((y,v x):env) b)
+	return (AAbs x a' t', cs)
       _ -> Bad (render ("function type expected for" <+> ppTerm Unqualified 0 e <+> "instead of" <+> ppValue Unqualified 0 typ))
 
     Let (x, (mb_typ, e1)) e2 -> do
@@ -151,7 +150,7 @@ checkExp th tenv@(k,rho,gamma) e ty = do
       (b',csb) <- checkType th (k+1, (x,v x):rho, (x,VClos rho a):gamma) b
       return (AProd x a' b', csa ++ csb)
 
-    R xs ->
+    R xs -> 
       case typ of
         VRecType ys -> do case [l | (l,_) <- ys, isNothing (lookup l xs)] of
                             [] -> return ()
@@ -175,7 +174,7 @@ checkInferExp th tenv@(k,_,_) e typ = do
   (e',w,cs1) <- inferExp th tenv e
   cs2 <- eqVal k w typ
   return (e',cs1 ++ cs2)
-
+      
 inferExp :: Theory -> TCEnv -> Term -> Err (AExp, Val, [(Val,Val)])
 inferExp th tenv@(k,rho,gamma) e = case e of
    Vr x -> mkAnnot (AVr x) $ noConstr $ lookupVar gamma x
@@ -201,13 +200,13 @@ inferExp th tenv@(k,rho,gamma) e = case e of
     (e2,val2,cs2) <- inferExp th (k,rho,(x,val1):gamma) e2
     return (ALet (x,(val1,e1)) e2, val2, cs1++cs2)
    App f t -> do
-    (f',w,csf) <- inferExp th tenv f
+    (f',w,csf) <- inferExp th tenv f 
     typ <- whnf w
     case typ of
       VClos env (Prod _ x a b) -> do
         (a',csa) <- checkExp th tenv t (VClos env a)
-        b' <- whnf $ VClos ((x,VClos rho t):env) b
-        return $ (AApp f' a' b', b', csf ++ csa)
+	b' <- whnf $ VClos ((x,VClos rho t):env) b
+	return $ (AApp f' a' b', b', csf ++ csa)
       _ -> Bad (render ("Prod expected for function" <+> ppTerm Unqualified 0 f <+> "instead of" <+> ppValue Unqualified 0 typ))
    _ -> Bad (render ("cannot infer type of expression" <+> ppTerm Unqualified 0 e))
 
@@ -233,9 +232,9 @@ checkAssign th tenv@(k,rho,gamma) typs (lbl,(Nothing,exp)) = do
                    return ((lbl,(val,aexp)),cs)
 
 checkBranch :: Theory -> TCEnv -> Equation -> Val -> Err (([Term],AExp),[(Val,Val)])
-checkBranch th tenv b@(ps,t) ty = errIn ("branch" +++ show b) $
-                                  chB tenv' ps' ty
- where
+checkBranch th tenv b@(ps,t) ty = errIn ("branch" +++ show b) $ 
+                                  chB tenv' ps' ty 
+ where 
 
   (ps',_,rho2,k') = ps2ts k ps
   tenv' = (k, rho2++rho, gamma) ---- k' ?
@@ -246,11 +245,11 @@ checkBranch th tenv b@(ps,t) ty = errIn ("branch" +++ show b) $
       typ <- whnf ty
       case typ of
         VClos env (Prod _ y a b) -> do
-          a' <- whnf $ VClos env a
+	  a' <- whnf $ VClos env a
           (p', sigma, binds, cs1) <- checkP tenv p y a'
           let tenv' = (length binds, sigma ++ rho, binds ++ gamma)
           ((ps',exp),cs2) <- chB tenv' ps2 (VClos ((y,p'):env) b)
-          return ((p:ps',exp), cs1 ++ cs2) -- don't change the patt
+	  return ((p:ps',exp), cs1 ++ cs2) -- don't change the patt
         _ -> Bad (render ("Product expected for definiens" <+> ppTerm Unqualified 0 t <+> "instead of" <+> ppValue Unqualified 0 typ))
     [] -> do
       (e,cs) <- checkExp th tenv t ty
@@ -260,15 +259,15 @@ checkBranch th tenv b@(ps,t) ty = errIn ("branch" +++ show b) $
      let sigma = [(x, VGen i x) | ((x,_),i) <- zip delta [k..]]
      return (VClos sigma t, sigma, delta, cs)
 
-  ps2ts k = foldr p2t ([],0,[],k)
+  ps2ts k = foldr p2t ([],0,[],k) 
   p2t p (ps,i,g,k) = case p of
-     PW      -> (Meta i : ps, i+1,g,k)
+     PW      -> (Meta i : ps, i+1,g,k) 
      PV x    -> (Vr x   : ps, i, upd x k g,k+1)
      PAs x p -> p2t p (ps,i,g,k)
      PString s -> (K s : ps, i, g, k)
      PInt n -> (EInt n : ps, i, g, k)
      PFloat n -> (EFloat n : ps, i, g, k)
-     PP c xs -> (mkApp (Q c) xss : ps, j, g',k')
+     PP c xs -> (mkApp (Q c) xss : ps, j, g',k') 
                     where (xss,j,g',k') = foldr p2t ([],i,g,k) xs
      PImplArg p -> p2t p (ps,i,g,k)
      PTilde t -> (t : ps, i, g, k)
@@ -308,8 +307,8 @@ checkPatt th tenv exp val = do
        case typ of
          VClos env (Prod _ x a b) -> do
            (a',_,csa) <- checkExpP tenv t (VClos env a)
-           b' <- whnf $ VClos ((x,VClos rho t):env) b
-           return $ (AApp f' a' b', b', csf ++ csa)
+	   b' <- whnf $ VClos ((x,VClos rho t):env) b
+	   return $ (AApp f' a' b', b', csf ++ csa)
          _ -> Bad (render ("Prod expected for function" <+> ppTerm Unqualified 0 f <+> "instead of" <+> ppValue Unqualified 0 typ))
      _ -> Bad (render ("cannot typecheck pattern" <+> ppTerm Unqualified 0 exp))
 
@@ -322,3 +321,4 @@ mkAnnot :: (Val -> AExp) -> Err (Val,[(Val,Val)]) -> Err (AExp,Val,[(Val,Val)])
 mkAnnot a ti = do
   (v,cs) <- ti
   return (a v, v, cs)
+

src/compiler/GF/Compile/Update.hs

@@ -5,7 +5,7 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/05/30 18:39:44 $
+-- > CVS $Date: 2005/05/30 18:39:44 $ 
 -- > CVS $Author: aarne $
 -- > CVS $Revision: 1.8 $
 --
@@ -27,21 +27,20 @@ import Data.List
 import qualified Data.Map as Map
 import Control.Monad
 import GF.Text.Pretty
-import qualified Control.Monad.Fail as Fail
 
 -- | combine a list of definitions into a balanced binary search tree
-buildAnyTree :: Fail.MonadFail m => ModuleName -> [(Ident,Info)] -> m (Map.Map Ident Info)
+buildAnyTree :: Monad m => ModuleName -> [(Ident,Info)] -> m (Map.Map Ident Info)
 buildAnyTree m = go Map.empty
   where
     go map []         = return map
-    go map ((c,j):is) =
+    go map ((c,j):is) = do
       case Map.lookup c map of
         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)))
+		     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)))
         Nothing -> go (Map.insert c j map) is
 
 extendModule :: FilePath -> SourceGrammar -> SourceModule -> Check SourceModule
@@ -51,18 +50,14 @@ extendModule cwd gr (name,m)
   ---- Should be replaced by real control. AR 4/2/2005
   | mstatus m == MSIncomplete && isModCnc m = return (name,m)
   | otherwise                               = checkInModule cwd m NoLoc empty $ do
-                                                 m' <- foldM extOne m (mextend m)
+                                                 m' <- foldM extOne m (mextend m) 
                                                  return (name,m')
  where
    extOne mo (n,cond) = do
      m0 <- lookupModule gr n
 
-     case m0 of
-       ModPGF _ -> checkError ("cannot extend the precompiled module" <+> n)
-       _        -> return ()
-
      -- test that the module types match, and find out if the old is complete
-     unless (sameMType (mtype m) (mtype mo))
+     unless (sameMType (mtype m) (mtype mo)) 
             (checkError ("illegal extension type to module" <+> name))
 
      let isCompl = isCompleteModule m0
@@ -71,7 +66,7 @@ extendModule cwd gr (name,m)
      js1 <- extendMod gr isCompl ((n,m0), isInherited cond) name (jments mo)
 
      -- if incomplete, throw away extension information
-     return $
+     return $ 
           if isCompl
             then mo {jments = js1}
             else mo {mextend= filter ((/=n) . fst) (mextend mo)
@@ -79,10 +74,10 @@ extendModule cwd gr (name,m)
                     ,jments = js1
                     }
 
--- | rebuilding instance + interface, and "with" modules, prior to renaming.
+-- | rebuilding instance + interface, and "with" modules, prior to renaming. 
 -- AR 24/10/2003
 rebuildModule :: FilePath -> SourceGrammar -> SourceModule -> Check SourceModule
-rebuildModule cwd gr mo@(i,mi@(ModInfo mt stat fs_ me mw ops_ med_ msrc_ mseqs js_)) =
+rebuildModule cwd gr mo@(i,mi@(ModInfo mt stat fs_ me mw ops_ med_ msrc_ env_ js_)) =
   checkInModule cwd mi NoLoc empty $ do
 
 ----  deps <- moduleDeps ms
@@ -92,8 +87,8 @@ rebuildModule cwd gr mo@(i,mi@(ModInfo mt stat fs_ me mw ops_ med_ msrc_ mseqs j
 
     -- add the information given in interface into an instance module
     Nothing -> do
-      unless (null is || mstatus mi == MSIncomplete)
-             (checkError ("module" <+> i <+>
+      unless (null is || mstatus mi == MSIncomplete) 
+             (checkError ("module" <+> i <+> 
                           "has open interfaces and must therefore be declared incomplete"))
       case mt of
         MTInstance (i0,mincl) -> do
@@ -114,10 +109,9 @@ rebuildModule cwd gr mo@(i,mi@(ModInfo mt stat fs_ me mw ops_ med_ msrc_ mseqs j
     -- add the instance opens to an incomplete module "with" instances
     Just (ext,incl,ops) -> do
       let (infs,insts) = unzip ops
-      let stat' = if all (flip elem infs) is
-                    then MSComplete
-                    else MSIncomplete
-      unless (stat' == MSComplete || stat == MSIncomplete)
+      let stat' = ifNull MSComplete (const MSIncomplete)
+                    [i | i <- is, notElem i infs]
+      unless (stat' == MSComplete || stat == MSIncomplete) 
              (checkError ("module" <+> i <+> "remains incomplete"))
       ModInfo mt0 _ fs me' _ ops0 _ fpath _ js <- lookupModule gr ext
       let ops1 = nub $
@@ -135,7 +129,7 @@ rebuildModule cwd gr mo@(i,mi@(ModInfo mt stat fs_ me mw ops_ med_ msrc_ mseqs j
                                     js
       let js1 = Map.union js0 js_
       let med1= nub (ext : infs ++ insts ++ med_)
-      return $ ModInfo mt0 stat' fs1 me Nothing ops1 med1 msrc_ mseqs js1
+      return $ ModInfo mt0 stat' fs1 me Nothing ops1 med1 msrc_ env_ js1
 
   return (i,mi')
 
@@ -145,24 +139,24 @@ rebuildModule cwd gr mo@(i,mi@(ModInfo mt stat fs_ me mw ops_ med_ msrc_ mseqs j
 extendMod :: Grammar ->
              Bool -> (Module,Ident -> Bool) -> ModuleName ->
              Map.Map Ident Info -> Check (Map.Map Ident Info)
-extendMod gr isCompl ((name,mi),cond) base new = foldM try new $ Map.toList (jments mi)
+extendMod gr isCompl ((name,mi),cond) base new = foldM try new $ Map.toList (jments mi) 
   where
     try new (c,i0)
       | not (cond c) = return new
       | otherwise    = case Map.lookup c new of
                          Just j -> case unifyAnyInfo name i j of
-                                     Ok k  -> return $ Map.insert c k new
-                                     Bad _ -> do (base,j) <- case j of
-                                                               AnyInd _ m -> lookupOrigInfo gr (m,c)
-                                                               _          -> return (base,j)
-                                                 (name,i) <- case i of
+		                     Ok k  -> return $ Map.insert c k new
+		                     Bad _ -> do (base,j) <- case j of 
+		                                               AnyInd _ m -> lookupOrigInfo gr (m,c)
+		                                               _          -> return (base,j)
+		                                 (name,i) <- case i of 
                                                                AnyInd _ m -> lookupOrigInfo gr (m,c)
                                                                _          -> return (name,i)
-                                                 checkError ("cannot unify the information" $$
-                                                             nest 4 (ppJudgement Qualified (c,i)) $$
-                                                             "in module" <+> name <+> "with" $$
-                                                             nest 4 (ppJudgement Qualified (c,j)) $$
-                                                             "in module" <+> base)
+		                                 checkError ("cannot unify the information" $$ 
+		                                             nest 4 (ppJudgement Qualified (c,i)) $$
+		                                             "in module" <+> name <+> "with" $$
+		                                             nest 4 (ppJudgement Qualified (c,j)) $$
+		                                             "in module" <+> base)
                          Nothing-> if isCompl
                                      then return $ Map.insert c (indirInfo name i) new
                                      else return $ Map.insert c i new
@@ -170,11 +164,11 @@ extendMod gr isCompl ((name,mi),cond) base new = foldM try new $ Map.toList (jme
         i = globalizeLoc (msrc mi) i0
 
     indirInfo :: ModuleName -> Info -> Info
-    indirInfo n info = AnyInd b n' where
+    indirInfo n info = AnyInd b n' where 
       (b,n') = case info of
         ResValue _ _ -> (True,n)
         ResParam _ _ -> (True,n)
-        AbsFun _ _ Nothing _ -> (True,n)
+        AbsFun _ _ Nothing _ -> (True,n) 
         AnyInd b k -> (b,k)
         _ -> (False,n) ---- canonical in Abs
 
@@ -183,7 +177,7 @@ globalizeLoc fpath i =
     AbsCat mc             -> AbsCat (fmap gl mc)
     AbsFun mt ma md moper -> AbsFun (fmap gl mt) ma (fmap (fmap gl) md) moper
     ResParam mt mv        -> ResParam (fmap gl mt) mv
-    ResValue t i          -> ResValue (gl t) i
+    ResValue t offset     -> ResValue (gl t) offset
     ResOper mt m          -> ResOper (fmap gl mt) (fmap gl m)
     ResOverload ms os     -> ResOverload ms (map (\(x,y) -> (gl x,gl y)) os)
     CncCat mc md mr mp mpmcfg-> CncCat (fmap gl mc) (fmap gl md) (fmap gl mr) (fmap gl mp) mpmcfg
@@ -198,24 +192,24 @@ globalizeLoc fpath i =
 
 unifyAnyInfo :: ModuleName -> Info -> Info -> Err Info
 unifyAnyInfo m i j = case (i,j) of
-  (AbsCat mc1, AbsCat mc2) ->
+  (AbsCat mc1, AbsCat mc2) -> 
     liftM AbsCat (unifyMaybeL mc1 mc2)
-  (AbsFun mt1 ma1 md1 moper1, AbsFun mt2 ma2 md2 moper2) ->
+  (AbsFun mt1 ma1 md1 moper1, AbsFun mt2 ma2 md2 moper2) -> 
     liftM4 AbsFun (unifyMaybeL mt1 mt2) (unifAbsArrity ma1 ma2) (unifAbsDefs md1 md2) (unifyMaybe moper1 moper2) -- adding defs
 
   (ResParam mt1 mv1, ResParam mt2 mv2) ->
     liftM2 ResParam (unifyMaybeL mt1 mt2) (unifyMaybe mv1 mv2)
-  (ResValue (L l1 t1) i1, ResValue (L l2 t2) i2)
+  (ResValue (L l1 t1) i1, ResValue (L l2 t2) i2) 
       | t1==t2 && i1 == i2 -> return (ResValue (L l1 t1) i1)
       | otherwise          -> fail ""
   (_, ResOverload ms t) | elem m ms ->
     return $ ResOverload ms t
-  (ResOper mt1 m1, ResOper mt2 m2) ->
+  (ResOper mt1 m1, ResOper mt2 m2) -> 
     liftM2 ResOper (unifyMaybeL mt1 mt2) (unifyMaybeL m1 m2)
 
-  (CncCat mc1 md1 mr1 mp1 mpmcfg1, CncCat mc2 md2 mr2 mp2 mpmcfg2) ->
+  (CncCat mc1 md1 mr1 mp1 mpmcfg1, CncCat mc2 md2 mr2 mp2 mpmcfg2) -> 
     liftM5 CncCat (unifyMaybeL mc1 mc2) (unifyMaybeL md1 md2) (unifyMaybeL mr1 mr2) (unifyMaybeL mp1 mp2)  (unifyMaybe mpmcfg1 mpmcfg2)
-  (CncFun m mt1 md1 mpmcfg1, CncFun _ mt2 md2 mpmcfg2) ->
+  (CncFun m mt1 md1 mpmcfg1, CncFun _ mt2 md2 mpmcfg2) -> 
     liftM3 (CncFun m) (unifyMaybeL mt1 mt2) (unifyMaybeL md1 md2) (unifyMaybe mpmcfg1 mpmcfg2)
 
   (AnyInd b1 m1, AnyInd b2 m2) -> do

src/compiler/GF/CompileInParallel.hs

@@ -1,6 +1,6 @@
 -- | Parallel grammar compilation
 module GF.CompileInParallel(parallelBatchCompile) where
-import Prelude hiding (catch,(<>))
+import Prelude hiding (catch)
 import Control.Monad(join,ap,when,unless)
 import Control.Applicative
 import GF.Infra.Concurrency
@@ -20,8 +20,6 @@ import GF.Infra.Ident(moduleNameS)
 import GF.Text.Pretty
 import GF.System.Console(TermColors(..),getTermColors)
 import qualified Data.ByteString.Lazy as BS
--- Control.Monad.Fail import will become redundant in GHC 8.8+
-import qualified Control.Monad.Fail as Fail
 
 -- | Compile the given grammar files and everything they depend on,
 -- like 'batchCompile'. This function compiles modules in parallel.
@@ -82,7 +80,7 @@ batchCompile1 lib_dir (opts,filepaths) =
      let rel = relativeTo lib_dir cwd
          prelude_dir = lib_dir</>"prelude"
          gfoDir = flag optGFODir opts
-     maybe (return ()) (D.createDirectoryIfMissing True) gfoDir
+     maybe done (D.createDirectoryIfMissing True) gfoDir
 {-
      liftIO $ writeFile (maybe "" id gfoDir</>"paths")
                         (unlines . map (unwords . map rel) . nub $ map snd filepaths)
@@ -110,12 +108,12 @@ batchCompile1 lib_dir (opts,filepaths) =
 --            logStrLn $ "Finished "++show (length (modules gr'))++" modules."
               return gr'
      fcache <- liftIO $ newIOCache $ \ _ (imp,Hide (f,ps)) ->
-                 do (file,_,_) <- findFile gfoDir ps M.empty imp
+                 do (file,_,_) <- findFile gfoDir ps imp
                     return (file,(f,ps))
      let find f ps imp =
            do (file',(f',ps')) <- liftIO $ readIOCache fcache (imp,Hide (f,ps))
               when (ps'/=ps) $
-                 do (file,_,_) <- findFile gfoDir ps M.empty imp
+                 do (file,_,_) <- findFile gfoDir ps imp
                     unless (file==file' || any fromPrelude [file,file']) $
                       do eq <- liftIO $ (==) <$> BS.readFile file <*> BS.readFile file'
                          unless eq $
@@ -240,14 +238,14 @@ instance (Functor m,Monad m) => Applicative (CollectOutput m) where
   (<*>) = ap
 
 instance Monad m => Monad (CollectOutput m) where
-  return x = CO (return (return (),x))
+  return x = CO (return (done,x))
   CO m >>= f = CO $ do (o1,x) <- m
                        let CO m2 = f x
                        (o2,y) <- m2
                        return (o1>>o2,y)
 instance MonadIO m => MonadIO (CollectOutput m) where
   liftIO io = CO $ do x <- liftIO io
-                      return (return (),x)
+                      return (done,x)
 
 instance Output m => Output (CollectOutput m) where
   ePutStr   s = CO (return (ePutStr s,()))
@@ -255,9 +253,6 @@ instance Output m => Output (CollectOutput m) where
   putStrLnE s = CO (return (putStrLnE s,()))
   putStrE   s = CO (return (putStrE s,()))
 
-instance Fail.MonadFail m => Fail.MonadFail (CollectOutput m) where
-  fail = CO . fail
-
 instance ErrorMonad m => ErrorMonad (CollectOutput m) where
   raise e = CO (raise e)
   handle (CO m) h = CO $ handle m (unCO . h)

src/compiler/GF/CompileOne.hs

@@ -8,6 +8,7 @@ module GF.CompileOne(-- ** Compiling a single module
 import GF.Compile.GetGrammar(getSourceModule)
 import GF.Compile.Rename(renameModule)
 import GF.Compile.CheckGrammar(checkModule)
+import GF.Compile.Optimize(optimizeModule)
 import GF.Compile.SubExOpt(subexpModule,unsubexpModule)
 import GF.Compile.GeneratePMCFG(generatePMCFG)
 import GF.Compile.Update(extendModule,rebuildModule)
@@ -18,23 +19,23 @@ import GF.Grammar.Printer(ppModule,TermPrintQual(..))
 import GF.Grammar.Binary(decodeModule,encodeModule)
 
 import GF.Infra.Option
-import GF.Infra.UseIO(FullPath,IOE,isGFO,gf2gfo,MonadIO(..),Output(..),putPointE,dumpOut,warnOut)
+import GF.Infra.UseIO(FullPath,IOE,isGFO,gf2gfo,MonadIO(..),Output(..),putPointE)
 import GF.Infra.CheckM(runCheck')
-import GF.Data.Operations(ErrorMonad,liftErr,(+++))
+import GF.Data.Operations(ErrorMonad,liftErr,(+++),done)
 
 import GF.System.Directory(doesFileExist,getCurrentDirectory,renameFile)
 import System.FilePath(makeRelative)
 import System.Random(randomIO)
 import qualified Data.Map as Map
 import GF.Text.Pretty(render,(<+>),($$)) --Doc,
+import GF.System.Console(TermColors(..),getTermColors)
 import Control.Monad((<=<))
-import qualified Control.Monad.Fail as Fail
 
 type OneOutput = (Maybe FullPath,CompiledModule)
 type CompiledModule = Module
 
 compileOne, reuseGFO, useTheSource ::
-    (Output m,ErrorMonad m,MonadIO m, Fail.MonadFail m) =>
+    (Output m,ErrorMonad m,MonadIO m) =>
     Options -> Grammar -> FullPath -> m OneOutput
 
 -- | Compile a given source file (or just load a .gfo file),
@@ -56,7 +57,7 @@ reuseGFO opts srcgr file =
              decodeModule file
      let sm0 = (fst sm00,(snd sm00){mflags=mflags (snd sm00) `addOptions` opts})
 
-     dumpOut opts Source (ppModule Internal sm0)
+     idump opts Source sm0
 
      let sm1 = unsubexpModule sm0
      (sm,warnings) <- -- putPointE Normal opts "creating indirections" $ 
@@ -65,7 +66,7 @@ reuseGFO opts srcgr file =
 
      if flag optTagsOnly opts
        then writeTags opts srcgr (gf2gftags opts file) sm1
-       else return ()
+       else done
 
      return (Just file,sm)
 
@@ -79,7 +80,7 @@ useTheSource opts srcgr file =
          sm <- putpOpt ("- parsing" +++ rfile)
                        ("- compiling" +++ rfile ++ "... ")
                        (getSourceModule opts file)
-         dumpOut opts Source (ppModule Internal sm)
+         idump opts Source sm
          compileSourceModule opts cwd (Just file) srcgr sm
   where
     putpOpt v m act
@@ -96,8 +97,8 @@ compileSourceModule opts cwd mb_gfFile gr =
     else generateGFO  <=< ifComplete (backend <=< middle) <=< frontend
   where
     -- Apply to all modules
-    frontend = runPass Extend  "extending"  . extendModule cwd gr
-           <=< runPass Rebuild "rebuilding" . rebuildModule cwd gr
+    frontend = runPass Extend  "" . extendModule cwd gr
+           <=< runPass Rebuild "" . rebuildModule cwd gr
 
     -- Apply to complete modules
     middle   = runPass TypeCheck "type checking" . checkModule opts cwd gr
@@ -105,9 +106,10 @@ compileSourceModule opts cwd mb_gfFile gr =
 
     -- Apply to complete modules when not generating tags
     backend mo3 =
-      do if isModCnc (snd mo3) && flag optPMCFG opts
-          then runPassI "generating PMCFG" $ fmap fst $ runCheck' opts (generatePMCFG opts cwd gr mo3)
-          else runPassI "" $ return mo3
+      do mo4 <- runPassE Optimize "optimizing" $ optimizeModule opts gr mo3
+         if isModCnc (snd mo4) && flag optPMCFG opts
+          then runPassI "generating PMCFG" $ generatePMCFG opts gr mb_gfFile mo4
+          else runPassI "" $ return mo4
 
     ifComplete yes mo@(_,mi) =
       if isCompleteModule mi then yes mo else return mo
@@ -125,16 +127,17 @@ compileSourceModule opts cwd mb_gfFile gr =
 
     -- * Running a compiler pass, with impedance matching
     runPass = runPass' fst fst snd (liftErr . runCheck' opts)
+    runPassE = runPass2e liftErr id
     runPassI = runPass2e id id Canon
     runPass2e lift dump = runPass' id dump (const "") lift
 
     runPass' ret dump warn lift pass pp m =
         do out <- putpp pp $ lift m
            warnOut opts (warn out)
-           dumpOut opts pass (ppModule Internal (dump out))
+           idump opts pass (dump out)
            return (ret out)
 
-    maybeM f = maybe (return ()) f
+    maybeM f = maybe done f
 
 
 --writeGFO :: Options -> InitPath -> FilePath -> SourceModule -> IOE ()
@@ -150,3 +153,20 @@ writeGFO opts cwd file mo =
     (m,mi) = subexpModule mo
 
     notAnyInd x = case x of AnyInd{} -> False; _ -> True
+
+-- to output an intermediate stage
+--intermOut :: Options -> Dump -> Doc -> IOE ()
+intermOut opts d doc
+  | dump opts d = ePutStrLn (render ("\n\n--#" <+> show d $$ doc))
+  | otherwise   = done
+
+idump opts pass = intermOut opts (Dump pass) . ppModule Internal
+
+warnOut opts warnings
+  | null warnings = done
+  | otherwise     = do t <- getTermColors
+                       ePutStr (blueFg t);ePutStr ws;ePutStrLn (restore t)
+  where
+    ws = if flag optVerbosity opts == Normal
+         then '\n':warnings
+         else warnings

src/compiler/GF/Compiler.hs

@@ -1,24 +1,20 @@
-module GF.Compiler (mainGFC, writeGrammar, writeOutputs) where
+module GF.Compiler (mainGFC, linkGrammars, writeGrammar, writeOutputs) where
 
 import PGF2
-import PGF2.Transactions
+import PGF2.Internal(unionPGF,writePGF,writeConcr)
 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
+import GF.Compile.GrammarToCanonical--(concretes2canonical)
 import GF.Compile.CFGtoPGF
 import GF.Compile.GetGrammar
 import GF.Grammar.BNFC
 import GF.Grammar.CFG
-import GF.Grammar.Grammar
-import GF.Grammar.JSON(grammar2json)
-import GF.Grammar.Printer(TermPrintQual(..),ppModule)
 
 --import GF.Infra.Ident(showIdent)
 import GF.Infra.UseIO
 import GF.Infra.Option
-import GF.Infra.CheckM
 import GF.Data.ErrM
 import GF.System.Directory
 import GF.Text.Pretty(render,render80)
@@ -27,9 +23,9 @@ import Data.Maybe
 import qualified Data.Map as Map
 import qualified Data.Set as Set
 import qualified Data.ByteString.Lazy as BSL
-import Text.JSON (encode)
+import GF.Grammar.CanonicalJSON (encodeJSON)
 import System.FilePath
-import Control.Monad(when,unless,forM_,foldM)
+import Control.Monad(when,unless,forM_)
 
 -- | Compile the given GF grammar files. The result is a number of @.gfo@ files
 -- and, depending on the options, a @.pgf@ file. (@gf -batch@, @gf -make@)
@@ -51,32 +47,43 @@ mainGFC opts fs = do
 
 compileSourceFiles :: Options -> [FilePath] -> IOE ()
 compileSourceFiles opts fs = 
-  do cnc_gr@(cnc,gr) <- S.batchCompile opts Nothing fs
-     let absname = srcAbsName gr cnc
-     exportCanonical absname gr
-     unless (flag optStopAfterPhase opts == Compile) $ do
-       let pgfFile = outputPath opts (grammarName' opts (render absname)<.>"pgf")
-       pgf <- link opts Nothing cnc_gr
-       writeGrammar opts pgf
-       writeOutputs opts pgf
+    do output <- batchCompile opts fs
+       exportCanonical output
+       unless (flag optStopAfterPhase opts == Compile) $
+           linkGrammars opts output
   where
-    exportCanonical absname gr =
-      do when (FmtHaskell `elem` ofmts && haskellOption opts HaskellConcrete) $ do
-           (res,_) <- runCheck (concretes2haskell opts absname gr)
-           mapM_ writeExport res
+    batchCompile = maybe batchCompile' parallelBatchCompile (flag optJobs opts)
+    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"
-              (gr_canon,_) <- runCheck (grammar2canonical opts absname gr)
-              forM_ (modules gr_canon) $ \m@(mn,_) -> do
-                writeExport ("canonical/"++render mn++".gf",render80 (ppModule Unqualified m))
-         when (FmtCanonicalJson `elem` ofmts) $
-           do (gr_canon,_) <- runCheck (grammar2canonical opts absname gr)
-              writeExport (render absname ++ ".json", encode (grammar2json gr_canon))
-         when (FmtSourceJson `elem` ofmts) $
-           do writeExport (render absname ++ ".json", encode (grammar2json gr))
+              mapM_ abs2canonical canonical
+              mapM_ cnc2canonical canonical
+         when (FmtCanonicalJson `elem` ofmts) $ mapM_ grammar2json canonical
       where
         ofmts = flag optOutputFormats opts
 
+    cnc2haskell (cnc,gr) =
+      do mapM_ writeExport $ 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
 
 
@@ -85,7 +92,7 @@ compileSourceFiles opts fs =
 -- If a @.pgf@ file by the same name already exists and it is newer than the
 -- source grammar files (as indicated by the 'UTCTime' argument), it is not
 -- recreated. Calls 'writeGrammar' and 'writeOutputs'.
-linkGrammars opts (t_src,cnc_gr@(cnc,gr)) =
+linkGrammars opts (t_src,~cnc_grs@(~(cnc,gr):_)) =
     do let abs = render (srcAbsName gr cnc)
            pgfFile = outputPath opts (grammarName' opts abs<.>"pgf")
        t_pgf <- if outputJustPGF opts
@@ -93,7 +100,8 @@ linkGrammars opts (t_src,cnc_gr@(cnc,gr)) =
                 else return Nothing
        if t_pgf >= Just t_src
          then putIfVerb opts $ pgfFile ++ " is up-to-date."
-         else do pgf <- link opts Nothing cnc_gr
+         else do pgfs <- mapM (link opts) cnc_grs
+                 let pgf = foldl1 (\one two -> fromMaybe two (unionPGF one two)) pgfs
                  writeGrammar opts pgf
                  writeOutputs opts pgf
 
@@ -125,32 +133,16 @@ unionPGFFiles opts fs =
            else doIt
 
     doIt =
-      case fs of
-        []     -> return ()
-        (f:fs) -> do mb_probs <- case flag optProbsFile opts of
-                                   Nothing   -> return Nothing
-                                   Just file -> fmap Just (readProbabilitiesFromFile file)
-                     pgf <- if snd (flag optLinkTargets opts)
-                              then case flag optName opts of
-                                     Just name -> do let fname = maybe id (</>) (flag optOutputDir opts) (name<.>"ngf")
-                                                     putStrLnE ("(Boot image "++fname++")")
-                                                     exists <- doesFileExist fname
-                                                     if exists
-                                                       then removeFile fname
-                                                       else return ()
-                                                     echo (\f -> bootNGFWithProbs f mb_probs fname) f
-                                     Nothing   -> do putStrLnE $ "To boot from a list of .pgf files add option -name"
-                                                     echo (\f -> readPGFWithProbs f mb_probs) f
-                              else echo (\f -> readPGFWithProbs f mb_probs) f
-                     pgf <- foldM (\pgf -> echo (modifyPGF pgf . mergePGF)) pgf fs
-                     let pgfFile = outputPath opts (grammarName opts pgf <.> "pgf")
-                     if pgfFile `elem` fs
-                       then putStrLnE $ "Refusing to overwrite " ++ pgfFile
-                       else writeGrammar opts pgf
-                     writeOutputs opts pgf
-
-    echo read f = putPointE Normal opts ("Reading " ++ f ++ "...") (liftIO (read f))
+      do pgfs <- mapM readPGFVerbose fs
+         let pgf = foldl1 (\one two -> fromMaybe two (unionPGF one two)) pgfs
+         let pgfFile = outputPath opts (grammarName opts pgf <.> "pgf")
+         if pgfFile `elem` fs
+           then putStrLnE $ "Refusing to overwrite " ++ pgfFile
+           else writeGrammar opts pgf
+         writeOutputs opts pgf
 
+    readPGFVerbose f =
+        putPointE Normal opts ("Reading " ++ f ++ "...") $ liftIO $ readPGF f
 
 -- | Export the PGF to the 'OutputFormat's specified in the 'Options'.
 -- Calls 'exportPGF'.
@@ -165,10 +157,19 @@ writeOutputs opts pgf = do
 -- A split PGF file is output if the @-split-pgf@ option is used.
 writeGrammar :: Options -> PGF -> IOE ()
 writeGrammar opts pgf =
-  if fst (flag optLinkTargets opts)
-    then do let outfile = outputPath opts (grammarName opts pgf <.> "pgf")
-            writing opts outfile (writePGF outfile pgf Nothing)
-    else return ()
+  if flag optSplitPGF opts then writeSplitPGF else writeNormalPGF
+  where
+    writeNormalPGF =
+       do let outfile = outputPath opts (grammarName opts pgf <.> "pgf")
+          writing opts outfile (writePGF outfile pgf)
+
+    writeSplitPGF =
+      do let outfile = outputPath opts (grammarName opts pgf <.> "pgf")
+         writing opts outfile $ writePGF outfile pgf
+         forM_ (Map.toList (languages pgf)) $ \(concrname,concr) -> do
+           let outfile = outputPath opts (concrname <.> "pgf_c")
+           writing opts outfile (writeConcr outfile concr)
+
 
 writeOutput :: Options -> FilePath-> String -> IOE ()
 writeOutput opts file str = writing opts path $ writeUTF8File path str
@@ -180,7 +181,7 @@ grammarName :: Options -> PGF -> String
 grammarName opts pgf = grammarName' opts (abstractName pgf)
 grammarName' opts abs = fromMaybe abs (flag optName opts)
 
-outputJustPGF opts = null (flag optOutputFormats opts)
+outputJustPGF opts = null (flag optOutputFormats opts) && not (flag optSplitPGF opts)
 
 outputPath opts file = maybe id (</>) (flag optOutputDir opts) file