diff --git a/PTQ.cabal b/PTQ.cabal --- a/PTQ.cabal +++ b/PTQ.cabal @@ -1,10 +1,10 @@ Name: PTQ -Version: 0.0.6 +Version: 0.0.7 License: LGPL License-File: COPYING Author: Masahiro Sakai Maintainer: Masahiro Sakai -Homepage: http://www.tom.sfc.keio.ac.jp/~sakai/hiki/?hsPTQ +Homepage: http://msakai.jp/hiki/?hsPTQ Category: Natural Language Processing Build-Type: Simple Synopsis: An implementation of Montague's PTQ. @@ -14,7 +14,8 @@ Extra-Source-Files: README.md, COPYING, .travis.yml, src/Context.hs, src/MP.hs, src/PDict.hs, src/ParserTest.hs, - misc/Test.hs, misc/Test2.agda, misc/Test3.hs + misc/Test.hs, misc/Test2.agda, misc/Test3.hs, + haste/index.html, haste/ptq.hs, haste/Makefile Data-Files: cgi/index.html, cgi/main.html Source-Repository head @@ -31,6 +32,10 @@ Default: True Manual: True +flag network-uri + description: Get Network.URI from the network-uri package + default: True + Executable ptq Main-Is: Main.hs Hs-Source-Dirs: src @@ -40,7 +45,7 @@ Translation Parser Report - Version + Paths_PTQ Extensions: EmptyDataDecls GADTs @@ -59,7 +64,6 @@ P Translation Parser - Version ReportHTML CGI URLEncoding @@ -73,5 +77,9 @@ FlexibleInstances CPP Build-Depends: base >=4.4 && <5, mtl, containers, network, xml + if flag(network-uri) + build-depends: network-uri >= 2.6, network >= 2.6 + else + build-depends: network-uri < 2.6, network < 2.6 if flag(UTF8CGI) CPP-Options: "-DUSE_UTF8" 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) +[![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 and Install ----------------- @@ -42,4 +42,10 @@ By locating ptq.cgi, cgi/index.html and cgi/main.html to the place where CGI is executable, you can try it on the web. -Demo site runs at . +Demo site runs at (currently not working). + +Haste interface +--------------- + +You can use [Haste](http://haste-lang.org/) to compile haste/* and run on your browsers. +Demo site runs at . diff --git a/cgi/main.html b/cgi/main.html --- a/cgi/main.html +++ b/cgi/main.html @@ -6,7 +6,7 @@ -

Demo page of PTQ

+

Demo page of PTQ

diff --git a/haste/Makefile b/haste/Makefile new file mode 100644 --- /dev/null +++ b/haste/Makefile @@ -0,0 +1,2 @@ +ptq.js: ptq.hs + hastec --make -O -i../src -i../dist/build/autogen -DUSE_UTF8 ptq.hs diff --git a/haste/index.html b/haste/index.html new file mode 100644 --- /dev/null +++ b/haste/index.html @@ -0,0 +1,50 @@ + + + + + +Demo page of PTQ + + + +

Demo page of PTQ

+ +

+ + +

+ +

+Sample: +

+ +

Result:

+

+
+
+
diff --git a/haste/ptq.hs b/haste/ptq.hs
new file mode 100644
--- /dev/null
+++ b/haste/ptq.hs
@@ -0,0 +1,33 @@
+{-# OPTIONS_GHC -Wall #-}
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Main
+-- Copyright   :  (c) Masahiro Sakai 2007-2014
+-- License     :  BSD3-style (see LICENSE)
+-- 
+-- Maintainer:    masahiro.sakai@gmail.com
+-- Stability   :  experimental
+-- Portability :  non-portable
+
+module Main where
+
+import Control.Monad
+import Haste
+import Report
+
+main :: IO ()
+main = do
+  withElems ["button-translate-input", "button-translate-sample", "input", "output", "sample"] $ \[button1, button2, input, output, sample] -> do
+    let update s = do
+          clearChildren output
+          e <- newTextElem (report s)
+          addChild e output
+
+    _ <- onEvent input OnKeyPress $ \c -> do
+      when (c == fromEnum '\r' || c == fromEnum '\n') $ do
+        update =<< getProp input "value"
+    _ <- button1 `onEvent` OnClick $ \_ _ -> do
+      update =<< getProp input "value"
+    _ <- button2 `onEvent` OnClick $ \_ _ -> do
+      update =<< getProp sample "value"
+    return ()
diff --git a/src/Main.hs b/src/Main.hs
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -10,7 +10,8 @@
 
 module Main where
 import Report
-import Version
+import Paths_PTQ
+import Data.Version
 import System.IO
 
 main :: IO ()
@@ -21,7 +22,7 @@
 
 banner :: String
 banner = unlines
-  [ "PTQ version " ++ versionStr
+  [ "PTQ version " ++ showVersion version
   , ""
   , "Type :quit to quit"
   ]
diff --git a/src/Version.hs b/src/Version.hs
deleted file mode 100644
--- a/src/Version.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module Version where
-
-versionStr :: String
-versionStr = "0.0.5"