starlitcanopy/simple-sql-parser
1
Fork 0
Code Activity

update changelog, small haddock fixes

Browse source
This commit is contained in:
Jake Wheat 2013-12-31 12:20:07 +02:00
parent 9e75fa9365
commit 9611885448
3 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Language/SQL/SimpleSQL/Parser.lhs
View file

@ -30,18 +30,20 @@ The public API functions.
> parseQueryExpr :: FilePath > parseQueryExpr :: FilePath
> -- ^ filename to use in errors > -- ^ filename to use in errors
> -> Maybe (Int,Int) > -> Maybe (Int,Int)
> -- ^ line number and column number to use in errors > -- ^ line number and column number of the first character
> -- in the source (to use in errors)
> -> String > -> String
> -- ^ the SQL source to parse > -- ^ the SQL source to parse
> -> Either ParseError QueryExpr > -> Either ParseError QueryExpr
> parseQueryExpr = wrapParse topLevelQueryExpr > parseQueryExpr = wrapParse topLevelQueryExpr
> -- | Parses a list of query exprs, with semi colons between > -- | Parses a list of query expressions, with semi colons between
> -- them. The final semicolon is optional. > -- them. The final semicolon is optional.
> parseQueryExprs :: FilePath > parseQueryExprs :: FilePath
> -- ^ filename to use in errors > -- ^ filename to use in errors
> -> Maybe (Int,Int) > -> Maybe (Int,Int)
> -- ^ line number and column number to use in errors > -- ^ line number and column number of the first character
> -- in the source (to use in errors)
> -> String > -> String
> -- ^ the SQL source to parse > -- ^ the SQL source to parse
> -> Either ParseError [QueryExpr] > -> Either ParseError [QueryExpr]
@ -51,7 +53,8 @@ The public API functions.
> parseValueExpr :: FilePath > parseValueExpr :: FilePath
> -- ^ filename to use in errors > -- ^ filename to use in errors
> -> Maybe (Int,Int) > -> Maybe (Int,Int)
> -- ^ line number and column number to use in errors > -- ^ line number and column number of the first character
> -- in the source (to use in errors)
> -> String > -> String
> -- ^ the SQL source to parse > -- ^ the SQL source to parse
> -> Either ParseError ValueExpr > -> Either ParseError ValueExpr
@ -476,6 +479,8 @@ unary prefix, unary postfix and binary infix operators. The operators
can be symbols (a + b), single keywords (a and b) or multiple keywords can be symbols (a + b), single keywords (a and b) or multiple keywords
(a is similar to b). (a is similar to b).
TODO: carefully review the precedences and associativities.
> opTable :: Bool -> [[E.Operator String () Identity ValueExpr]] > opTable :: Bool -> [[E.Operator String () Identity ValueExpr]]
> opTable bExpr = > opTable bExpr =
> [[binarySym "." E.AssocLeft] > [[binarySym "." E.AssocLeft]

3
Language/SQL/SimpleSQL/Pretty.lhs
View file

@ -8,6 +8,9 @@
> ,prettyQueryExprs > ,prettyQueryExprs
> ) where > ) where
TODO: there should be more comments in this file, especially the bits
which have been changed to try to improve the layout of the output.
> import Language.SQL.SimpleSQL.Syntax > import Language.SQL.SimpleSQL.Syntax
> import Text.PrettyPrint (render, vcat, text, (<>), (<+>), empty, parens, > import Text.PrettyPrint (render, vcat, text, (<>), (<+>), empty, parens,
> nest, Doc, punctuate, comma, sep, quotes, > nest, Doc, punctuate, comma, sep, quotes,

9
changelog
View file

@ -1,4 +1,8 @@
0.3.0-dev (commit 3b2730fd9962b9a51ad659191ac842364dab86b4) 0.3.0-dev (commit 9e75fa93650b4f1a08d94f4225a243bcc50445ae)
fix the basic operator fixity parsing
swap the order in select item abstract syntax so it is now
(expression, alias) which matches the order in the concrete
syntax
rename ScalarExpr -> ValueExpr rename ScalarExpr -> ValueExpr
rename Duplicates to SetQuantifier rename Duplicates to SetQuantifier
rename qeDuplicates to qeSetQuantifier rename qeDuplicates to qeSetQuantifier
@ -29,6 +33,9 @@
bit varying bit varying
rename tools/PrettyIt to tools/SQLIdent and add to cabal file as rename tools/PrettyIt to tools/SQLIdent and add to cabal file as
optional executable (disabled by default) optional executable (disabled by default)
rename the qeFetch field in Select to qeFetchFirst
change the pretty printer to use 'fetch first' instead of
'fetch next'
0.2.0 (commit 9ea29c1a0ceb2c3f3157fb161d1ea819ea5d64d4) 0.2.0 (commit 9ea29c1a0ceb2c3f3157fb161d1ea819ea5d64d4)
'' quotes in string literal '' quotes in string literal