diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 --- a/.travis.yml +++ /dev/null @@ -1,56 +0,0 @@ -# NB: don't set `language: haskell` here - -# The following enables several GHC versions to be tested; often it's enough to test only against the last release in a major GHC version. Feel free to omit lines listings versions you don't need/want testing for. -env: -# - GHCVER=6.12.3 -# - GHCVER=7.0.1 -# - GHCVER=7.0.2 -# - GHCVER=7.0.3 -# - GHCVER=7.0.4 -# - GHCVER=7.2.1 -# - GHCVER=7.2.2 -# - GHCVER=7.4.1 - - GHCVER=7.4.2 -# - GHCVER=7.6.1 -# - GHCVER=7.6.2 - - GHCVER=7.6.3 -# - GHCVER=7.8.1 # see note about Alex/Happy -# - GHCVER=7.8.2 # see note about Alex/Happy - - GHCVER=7.8.3 # see note about Alex/Happy -# - GHCVER=head # see section about GHC HEAD snapshots - -# Note: the distinction between `before_install` and `install` is not important. -before_install: - - travis_retry sudo add-apt-repository -y ppa:hvr/ghc - - travis_retry sudo apt-get update - - travis_retry sudo apt-get install cabal-install-1.18 ghc-$GHCVER # see note about happy/alex - - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/1.18/bin:$PATH - - | - if [ $GHCVER = "head" ] || [ ${GHCVER%.*} = "7.8" ]; then - travis_retry sudo apt-get install happy-1.19.3 alex-3.1.3 - export PATH=/opt/alex/3.1.3/bin:/opt/happy/1.19.3/bin:$PATH - else - travis_retry sudo apt-get install happy alex - fi - -install: - - cabal update - - cabal install --only-dependencies --enable-tests -v2 # -v2 provides useful information for debugging - -# Here starts the actual work to be performed for the package under test; any command which exits with a non-zero exit code causes the build to fail. -script: - - cabal configure --enable-tests -v2 # -v2 provides useful information for debugging - - cabal build # this builds all libraries and executables (including tests/benchmarks) - - cabal test - - cabal check - - cabal sdist # tests that a source-distribution can be generated - -# The following scriptlet checks that the resulting source distribution can be built & installed - - export SRC_TGZ=$(cabal-1.18 info . | awk '{print $2 ".tar.gz";exit}') ; - cd dist/; - if [ -f "$SRC_TGZ" ]; then - cabal install "$SRC_TGZ"; - else - echo "expected '$SRC_TGZ' not found"; - exit 1; - fi diff --git a/PTQ.cabal b/PTQ.cabal --- a/PTQ.cabal +++ b/PTQ.cabal @@ -1,5 +1,5 @@ Name: PTQ -Version: 0.0.7 +Version: 0.0.8 License: LGPL License-File: COPYING Author: Masahiro Sakai @@ -11,8 +11,13 @@ Description: An implementation of Montague's PTQ (Proper Treatment of Quantification). It translates simple plain English sentences into formulas of intentional logic. Cabal-Version: >= 1.6 Stability: experimental +Tested-With: + GHC ==7.8.4 + GHC ==7.10.3 + GHC ==8.0.1 + GHC ==8.2.1 Extra-Source-Files: - README.md, COPYING, .travis.yml, + README.md, COPYING, src/Context.hs, src/MP.hs, src/PDict.hs, src/ParserTest.hs, misc/Test.hs, misc/Test2.agda, misc/Test3.hs, haste/index.html, haste/ptq.hs, haste/Makefile @@ -44,6 +49,7 @@ P Translation Parser + MP Report Paths_PTQ Extensions: @@ -64,6 +70,7 @@ P Translation Parser + MP ReportHTML CGI URLEncoding diff --git a/README.md b/README.md --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ An implementation of Montague's PTQ in Haskell ============================================== -[![Build Status](https://secure.travis-ci.org/msakai/ptq.png?branch=master)](http://travis-ci.org/msakai/ptq) [![Hackage](https://budueba.com/hackage/PTQ)](https://hackage.haskell.org/package/PTQ) +[![Build Status](https://secure.travis-ci.org/msakai/ptq.png?branch=master)](http://travis-ci.org/msakai/ptq) [![Hackage](https://img.shields.io/hackage/v/PTQ.svg)](https://hackage.haskell.org/package/PTQ) Build and Install ----------------- @@ -48,4 +48,4 @@ --------------- You can use [Haste](http://haste-lang.org/) to compile haste/* and run on your browsers. -Demo site runs at . +Demo site runs at . diff --git a/misc/Test.hs b/misc/Test.hs --- a/misc/Test.hs +++ b/misc/Test.hs @@ -37,7 +37,7 @@ abstract name expr = Sc (h 0 expr) where h outer (FVar name') | name==name' = BVar 0 - | otherwise = FVar name' + | otherwise = FVar name' h outer (BVar index) = BVar index -- instantiate :: Expr u -> Scope t -> Expr t diff --git a/src/CGIMain.hs b/src/CGIMain.hs --- a/src/CGIMain.hs +++ b/src/CGIMain.hs @@ -25,7 +25,7 @@ appMain req = return $ case lookupVar "s" req of Nothing -> - HTTPResponse (textContentType "text/plain" "us-ascii") "(no input)\n" + HTTPResponse (textContentType "text/plain" "us-ascii") "(no input)\n" Just s -> - --HTTPResponse (textContentType "text/plain" "utf-8") (report s) + --HTTPResponse (textContentType "text/plain" "utf-8") (report s) HTTPResponse (textContentType "text/html" "utf-8") (report s) diff --git a/src/Context.hs b/src/Context.hs --- a/src/Context.hs +++ b/src/Context.hs @@ -37,8 +37,8 @@ {- inst :: Expr (c :* a) b -> Expr c a -> Expr c b inst (B v) x = case v of - B0 -> x - BS v -> B v + B0 -> x + BS v -> B v inst (a :@ b) x = inst a x :@ inst b x inst (Lam a) x = case x of @@ -63,14 +63,14 @@ -} shift' :: forall c d e e' u t. - (Append c d e, Append (c :* u) d e') => + (Append c d e, Append (c :* u) d e') => (forall t. BVar e t -> BVar e' t) -> - Expr e t -> Expr e' t + Expr e t -> Expr e' t shift' v (a :@ b) = shift' v a :@ shift' v b shift' v (B x) = B (v x) shift' v (Lam x) = Lam (shift' v' x) where v' B0 = B0 - v' (BS x) = BS (v x) + v' (BS x) = BS (v x) shift0 :: Expr c t -> Expr (c :* u) t shift0 (a :@ b) = shift0 a :@ shift0 b diff --git a/src/IL.hs b/src/IL.hs --- a/src/IL.hs +++ b/src/IL.hs @@ -227,7 +227,7 @@ $ a' . showChar ' ' . showString s . showChar ' ' . b' where (s,prec,l,r) = - case op of + case op of And -> (if unicode then "∧" else "&&", 4, id, id) -- ∧ (U+2227) Or -> (if unicode then "∨" else "||", 3, id, id) -- ∨ (U+2228) Imply -> (if unicode then "→" else "->", 1, (+1), id) -- → (U+2192)