From 9e75fa93650b4f1a08d94f4225a243bcc50445ae Mon Sep 17 00:00:00 2001 From: Jake Wheat Date: Tue, 31 Dec 2013 11:44:10 +0200 Subject: [PATCH] hlint --- Language/SQL/SimpleSQL/Parser.lhs | 5 +++-- Language/SQL/SimpleSQL/Pretty.lhs | 2 +- TODO | 4 ---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Language/SQL/SimpleSQL/Parser.lhs b/Language/SQL/SimpleSQL/Parser.lhs index cfc7e76..5e7a93b 100644 --- a/Language/SQL/SimpleSQL/Parser.lhs +++ b/Language/SQL/SimpleSQL/Parser.lhs @@ -1,3 +1,4 @@ + > {-# LANGUAGE TupleSections #-} > -- | This is the module with the parser functions. > module Language.SQL.SimpleSQL.Parser @@ -275,7 +276,7 @@ operatorname(firstArg keyword0 arg0 keyword1 arg1 etc.) > -- check we haven't parsed the first > -- keyword as an identifier > guard (case (e,kws) of -> (Iden (Name i), ((k,_):_)) | map toLower i == k -> False +> (Iden (Name i), (k,_):_) | map toLower i == k -> False > _ -> True) > return e > fa <- case firstArg of @@ -495,7 +496,7 @@ can be symbols (a + b), single keywords (a and b) or multiple keywords > ,binarySym "|" E.AssocRight > ,binaryKeyword "like" E.AssocNone > ,binaryKeyword "overlaps" E.AssocNone] -> ++ map (flip binaryKeywords E.AssocNone) +> ++ map (`binaryKeywords` E.AssocNone) > ["not like" > ,"is similar to" > ,"is not similar to" diff --git a/Language/SQL/SimpleSQL/Pretty.lhs b/Language/SQL/SimpleSQL/Pretty.lhs index 4c8542c..a87586b 100644 --- a/Language/SQL/SimpleSQL/Pretty.lhs +++ b/Language/SQL/SimpleSQL/Pretty.lhs @@ -92,7 +92,7 @@ > valueExpr (SpecialOpK nm fs as) = > name nm <> parens (sep $ catMaybes -> ((fmap valueExpr fs) +> (fmap valueExpr fs > : map (\(n,e) -> Just (text n <+> valueExpr e)) as)) > valueExpr (PrefixOp f e) = name f <+> valueExpr e diff --git a/TODO b/TODO index 2ce0038..c73ccc0 100644 --- a/TODO +++ b/TODO @@ -1,9 +1,5 @@ = next release -New fixity code + extensive tests. -check fixity in query expr level? -check fixity in tablerefs - try and use the proper css theme create a header like in the haddock with simple-sql-parser + contents link