khibino/haskell-relational-record
1
1
Fork 0
mirror of https://github.com/khibino/haskell-relational-record.git synced 2024-11-29 14:45:51 +03:00
Code Issues Projects Releases Wiki Activity

Use of monoid instance definitions.

Browse Source
This commit is contained in:
Kei Hibino 2014-05-12 18:16:37 +09:00
parent 472765d66a
commit 4cc5b1b3c6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sql-words/src/Language/SQL/Keyword/Concat.hs
View File

@ -33,8 +33,9 @@ module Language.SQL.Keyword.Concat (
import Prelude hiding (and, or, not) import Prelude hiding (and, or, not)
import Data.List (intersperse) import Data.List (intersperse)
import Data.Monoid (mconcat)
import Language.SQL.Keyword.Type (Keyword (..), word, wordShow, unwordsSQL) import Language.SQL.Keyword.Internal.Type (Keyword (..), word, wordShow, toDString, fromDString)
{- $listConcatination {- $listConcatination
@ -47,7 +48,7 @@ ws `sepBy'` d = map wordShow . intersperse d $ ws
-- | Concatinate 'Keyword' list like unwords on 'String' list. -- | Concatinate 'Keyword' list like unwords on 'String' list.
unwords' :: [Keyword] -> Keyword unwords' :: [Keyword] -> Keyword
unwords' = word . unwordsSQL unwords' = mconcat
-- | Concatinate 'String' list into one 'Keyword'. -- | Concatinate 'String' list into one 'Keyword'.
concatStr :: [String] -> Keyword concatStr :: [String] -> Keyword
@ -68,12 +69,12 @@ Binary operators on SQL. Result is concatinated into one 'Keyword'.
-- | Define binary operator on 'Keyword' type. -- | Define binary operator on 'Keyword' type.
-- Result is not delimited by whitespace like concat on 'String' list. -- Result is not delimited by whitespace like concat on 'String' list.
defineBinOp' :: Keyword -> Keyword -> Keyword -> Keyword defineBinOp' :: Keyword -> Keyword -> Keyword -> Keyword
defineBinOp' op a b = concatStr $ [a, b] `sepBy'` op defineBinOp' op a b = fromDString $ mconcat [toDString w | w <- [a, op, b]]
-- | Define binary operator on 'Keyword' type. -- | Define binary operator on 'Keyword' type.
-- Result is delimited by whitespace like unwords on 'String' list. -- Result is delimited by whitespace like unwords on 'String' list.
defineBinOp :: Keyword -> Keyword -> Keyword -> Keyword defineBinOp :: Keyword -> Keyword -> Keyword -> Keyword
defineBinOp op a b = word . unwords $ [a, b] `sepBy'` op defineBinOp op a b = mconcat [a, op, b]
-- | Binary operator to create qualified name on SQL. -- | Binary operator to create qualified name on SQL.
(<.>) :: Keyword -> Keyword -> Keyword (<.>) :: Keyword -> Keyword -> Keyword
@ -122,7 +123,7 @@ or = defineBinOp OR
-- | Define unary operator on 'Keyword' type represeted by specified 'Keyword'. -- | Define unary operator on 'Keyword' type represeted by specified 'Keyword'.
-- Result is delimited by whitespace like unwords on 'String' list. -- Result is delimited by whitespace like unwords on 'String' list.
defineUniOp :: Keyword -> Keyword -> Keyword defineUniOp :: Keyword -> Keyword -> Keyword
defineUniOp op e = unwords' [op, e] defineUniOp op e = mconcat [op, e]
-- | Binary `IN` operator for SQL. -- | Binary `IN` operator for SQL.
in' :: Keyword -> Keyword -> Keyword in' :: Keyword -> Keyword -> Keyword