diff --git a/HXQ.cabal b/HXQ.cabal --- a/HXQ.cabal +++ b/HXQ.cabal @@ -1,6 +1,6 @@ Cabal-Version: >= 1.2 Name: HXQ -Version: 0.17.0 +Version: 0.17.2 Synopsis: A Compiler from XQuery to Haskell Description: HXQ is a fast and space-efficient compiler from XQuery (the standard @@ -68,17 +68,13 @@ Library Exposed-Modules: Text.XML.HXQ.XQuery - Other-Modules: HXML, ETree, Misc, Tree, AssocList, PrintXML, XML, TreeBuild, DTD, XMLScanner, LLParsing, XMLParse, - Readline, Text.XML.HXQ.XTree, Text.XML.HXQ.Types, + Other-Modules: HXML, DeepSeq, ETree, Misc, Tree, AssocList, PrintXML, XML, TreeBuild, DTD, XMLScanner, LLParsing, XMLParse, + Text.XML.HXQ.XTree, Text.XML.HXQ.Types, Text.XML.HXQ.Functions, Text.XML.HXQ.Compiler, Text.XML.HXQ.Interpreter, Text.XML.HXQ.Optimizer, Text.XML.HXQ.OptionalDB, Text.XML.HXQ.Parser hs-source-dirs: . src src/hxml-0.2 - Build-Depends: base, haskell98, array, regex-base, regex-compat, template-haskell + Build-Depends: base >= 3 && < 5, haskell98, array, regex-base, regex-compat, template-haskell, mtl, haskeline ghc-options: -funfolding-use-threshold=16 - if impl(ghc < 6.10) - Build-Depends: readline - else - Build-Depends: editline if flag(mysql) Other-Modules: Text.XML.HXQ.DB, Connect Build-Depends: HDBC, HDBC-odbc @@ -95,16 +91,12 @@ Executable xquery Main-is: Main.hs hs-source-dirs: . src src/hxml-0.2 - if impl(ghc < 6.10) - Build-Depends: readline - else - Build-Depends: editline if flag(mysql) Build-Depends: HDBC, HDBC-odbc hs-source-dirs: src/withDB, src/mysql else { if flag(sqlite) - Build-Depends: HDBC, HDBC-odbc + Build-Depends: HDBC, HDBC-sqlite3 hs-source-dirs: src/withDB, src/sqlite else hs-source-dirs: src/noDB diff --git a/Main.hs b/Main.hs --- a/Main.hs +++ b/Main.hs @@ -2,7 +2,7 @@ - - The main program of the XQuery interpreter - Programmer: Leonidas Fegaras (fegaras@cse.uta.edu) -- Date: 01/13/2009 +- Date: 06/17/2009 - ---------------------------------------------------------------} @@ -10,24 +10,17 @@ module Main where -#if __GLASGOW_HASKELL__ >= 609 -import qualified Control.OldException as C -#else -import qualified Control.Exception as C -#endif import List(sort) import System.Environment import System.CPUTime +import qualified Control.Exception as C import Text.XML.HXQ.XQuery import Text.XML.HXQ.Functions import Text.XML.HXQ.Types import Text.XML.HXQ.Interpreter(evalInput,xqueryE,xfileDB) -type E = C.Exception - - -version = "0.17.0" +version = "0.17.2" parseEnv :: [String] -> [(String,String)] @@ -83,7 +76,8 @@ Just file -> case lookup "db" env of Just filepath -> do db <- connect filepath t1 <- getCPUTime - result <- xfileDB file db + query <- readFile file + (result,_,_,_) <- xqueryE query [] [] [] db verbose putXSeq result t2 <- getCPUTime putTime (t2-t1) @@ -112,7 +106,7 @@ putTime (t2-t1) commit db return (nes,nfs,nvs)) - (\e -> do putStrLn (show (e::E)); return (es,fs,vs))) [] [] [] "> " [] + (\e -> do putStrLn (show (e::C.SomeException)); return (es,fs,vs))) [] [] [] "> " [] return () _ -> do evalInput (\s es fs vs -> C.catch (do t1 <- getCPUTime @@ -121,5 +115,5 @@ t2 <- getCPUTime putTime (t2-t1) return (nes,nfs,nvs)) - (\e -> do putStrLn (show (e::E)); return (es,fs,vs))) [] [] [] "> " [] + (\e -> do putStrLn (show (e::C.SomeException)); return (es,fs,vs))) [] [] [] "> " [] return () diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ endif parser = src/Text/XML/HXQ/Parser.hs -ghc = ghc -O2 -funfolding-use-threshold=16 ${args} +ghc = ghc-6.8.3 -O2 -funfolding-use-threshold=16 ${args} src = * src/hxml-0.2/* src/noDB/Text/XML/HXQ/* src/withDB/Text/XML/HXQ/* \ src/* src/Text/XML/HXQ/* src/mysql/* src/sqlite/* @@ -54,11 +54,11 @@ # populate the DBLP database using the dblp.xml file dblp: $(parser) TestDBLP.hs $(ghc) --make TestDBLP.hs -o a.out - time ./a.out + time ./a.out +RTS -K20m # run in the ghci interpreter and load HXQ ghci: $(parser) - ghci -fth ${args} Main.hs + ghci -XTemplateHaskell ${args} Main.hs # run multiple tests test: $(parser) data/test.xq diff --git a/XQueryParser.y b/XQueryParser.y --- a/XQueryParser.y +++ b/XQueryParser.y @@ -143,19 +143,27 @@ | 'declare' 'variable' var 'as' type ':=' expr { Ast "variable" [$3,$7] } | 'declare' 'function' qname - '(' params ')' '{' expr '}' { Ast "function" ([Avar $3,$8]++$5) } + '(' opt_params ')' '{' expr '}' { if (null $5) + then parseError [TError ("Nullary functions are not supported: "++$3)] + else Ast "function" ([Avar $3,$8]++$5) } | 'declare' 'function' qname - '(' params ')' 'as' type - '{' expr '}' { Ast "function" ([Avar $3,$10]++$5) } - | 'declare' 'view' qname - '(' params ')' '{' expr '}' { Ast "view" ([Avar $3,$8]++$5) } + '(' opt_params ')' 'as' type + '{' expr '}' { if (null $5) + then parseError [TError ("Nullary functions are not supported: "++$3)] + else Ast "function" ([Avar $3,$10]++$5) } | 'declare' 'view' qname - '(' ')' '{' expr '}' { Ast "view" ([Avar $3,$7,Avar "."]) } + '(' opt_params ')' '{' expr '}' { if (null $5) + then parseError [TError ("Nullary views are not supported: "++$3)] + else Ast "view" ([Avar $3,$8]++$5) } qname :: { String } qname : 'QName' { $1 } | 'QName' ':' 'QName' { $1++":"++$3 } +opt_params :: { [ Ast ] } +opt_params : params { $1 } + | { [] } + params :: { [ Ast ] } params : var { [$1] } | var 'as' type { [$1] } @@ -734,6 +742,7 @@ var -> QName var in case token of QName v1 -> case rest of + ':':':':'*':rest2 -> [QName v1,COLON,COLON,TIMES] ++ lexer rest2 n ':':':':rest2 -> let (v2,rest3) = span isQN rest2 in [QName v1,COLON,COLON,QName v2] ++ lexer rest3 n ':':rest2 -> let (v2,rest3) = span isQN rest2 diff --git a/data/dblp.xq b/data/dblp.xq --- a/data/dblp.xq +++ b/data/dblp.xq @@ -2,7 +2,5 @@ for $x at $i in doc('data/dblp.xml')//inproceedings where $x/author = 'Leonidas Fegaras' order by $x/year descending - return { $i, ') ', $x/booktitle/text(), - ': ', $x/title/text() - } + return {$i}) {$x/booktitle/text()}: {$x/title/text()} } diff --git a/db.html b/db.html --- a/db.html +++ b/db.html @@ -7,7 +7,7 @@

HXQ with Database Connectivity

-

Download HXQ-0.17.0.tar.gz

+

Download HXQ-0.17.2.tar.gz

Installation Instructions (HXQ with database connectivity)

@@ -39,13 +39,17 @@ and create a database using the mysql command create database hxq.

-Then, you need to install the Haskell packages: +The simplest way to install HXQ with MySQL is to use cabal (see HXQ without Database Connectivity): +

+cabal install HXQ -fmysql
+
+Alternatively, you can download and install the packages HDBC -and the -HDBC-odbc driver. +and +HDBC-odbc. Then you untar HXQ and inside the HXQ directory you do: 
-runhaskell Setup.lhs configure -fmysql
+runhaskell Setup.lhs configure --user -fmysql
 runhaskell Setup.lhs build
 runhaskell Setup.lhs install
@@ -54,13 +58,17 @@

To use sqlite, you need to install SQLite. On Linux, you can install it using yum install sqlite. -Then you need to install the Haskell packages: +The simplest way to install HXQ with sqlite is to use cabal (see HXQ without Database Connectivity): +

+cabal install HXQ -fsqlite
+
+Alternatively, you can download and install the packages HDBC -and the -HDBC-sqlite3 driver. +and +HDBC-sqlite3. Then you untar HXQ and inside the HXQ directory you do: 
-runhaskell Setup.lhs configure -fsqlite
+runhaskell Setup.lhs configure --user -fsqlite
 runhaskell Setup.lhs build
 runhaskell Setup.lhs install
@@ -197,4 +205,4 @@

-

Last modified: 03/29/09 by Leonidas Fegaras
+
Last modified: 06/14/09 by Leonidas Fegaras
diff --git a/index.html b/index.html --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@

HXQ: A Compiler from XQuery to Haskell

-

Download HXQ-0.17.0.tar.gz

+

Download HXQ-0.17.2.tar.gz

Description

@@ -97,19 +97,37 @@ Compiler, ghc. Optionally, if you want to modify the XQuery parser, you need to install the parser generator for Haskell, -happy. Then, -download HXQ version 0.17.0 and untar +happy. +If you are new to Haskell, please read +How to install a Cabal package. The easiest way to install +packages in Haskell is using cabal. +On Linux, you can install all these tools using yum install ghc happy cabal-install. +

+The simplest way to install HXQ is by using the cabal command: +

+cabal install HXQ
+
+which will automatically download and install all required packages. +

+Alternatively, you can download and install all required packages one-by-one: +First download HXQ version 0.17.2 and untar it (using tar xfz on Linux/Mac or 7z x on Windows). Then, you execute the following commands inside the HXQ directory: 

-runhaskell Setup.lhs configure
+runhaskell Setup.lhs configure --user
 runhaskell Setup.lhs build
 runhaskell Setup.lhs install
-On linux, the last command must be run as root. +If the configure command indicates that haskeline is missing, install the packages +extensible-exceptions and +haskeline first +using the same process. +

HXQ consists of the executable xquery, which is the XQuery interpreter, and the -HXQ library. To use the HXQ library in a Haskell program, +HXQ library. +

+To use the HXQ library in a Haskell program, simply import Text.XML.HXQ.XQuery.

Installation Instructions for Database Connectivity

@@ -147,7 +165,7 @@

XQuery Documentation

The complete XQuery syntax in HXQ is described in hxq-manual.pdf. -I have also written a paper that describes some of the +I have also written a paper that describes some of the database related methods used in the implementation. Here some tutorials on XPath and XQuery. @@ -233,4 +251,4 @@

-

Last modified: 03/30/09 by Leonidas Fegaras
+
Last modified: 06/14/09 by Leonidas Fegaras
diff --git a/release.html b/release.html --- a/release.html +++ b/release.html @@ -10,6 +10,9 @@

+
HXQ-0.17.2 (released on 06/17/09)
+
Replaced editline/readline with haskeline. Fixed HXQ.cabal. +

HXQ-0.17.0 (released on 03/30/09)