clean up some warnings, remove parsec dep, fix a temp commented out test
This commit is contained in:
parent
af8ea544f6
commit
55a7537108
|
@ -64,7 +64,7 @@ module Language.SQL.SimpleSQL.Lex
|
||||||
,lexSQL
|
,lexSQL
|
||||||
,prettyToken
|
,prettyToken
|
||||||
,prettyTokens
|
,prettyTokens
|
||||||
,ParseError(..)
|
,ParseError
|
||||||
,prettyError
|
,prettyError
|
||||||
,tokenListWillPrintAndLex
|
,tokenListWillPrintAndLex
|
||||||
,ansi2011
|
,ansi2011
|
||||||
|
@ -252,7 +252,7 @@ sqlToken d = do
|
||||||
--------------------------------------
|
--------------------------------------
|
||||||
|
|
||||||
sqlString :: Dialect -> Parser Token
|
sqlString :: Dialect -> Parser Token
|
||||||
sqlString d =
|
sqlString _d =
|
||||||
SqlString "'" "'" <$> (char_ '\'' *> takeWhileP (Just "non quote char") (/= '\'') <* char_ '\'')
|
SqlString "'" "'" <$> (char_ '\'' *> takeWhileP (Just "non quote char") (/= '\'') <* char_ '\'')
|
||||||
|
|
||||||
{-
|
{-
|
||||||
|
|
|
@ -187,7 +187,7 @@ module Language.SQL.SimpleSQL.Parse
|
||||||
,parseScalarExpr
|
,parseScalarExpr
|
||||||
,parseStatement
|
,parseStatement
|
||||||
,parseStatements
|
,parseStatements
|
||||||
,ParseError(..)
|
,ParseError
|
||||||
,prettyError
|
,prettyError
|
||||||
) where
|
) where
|
||||||
|
|
||||||
|
@ -199,9 +199,8 @@ import Text.Megaparsec
|
||||||
,PosState(..)
|
,PosState(..)
|
||||||
,TraversableStream(..)
|
,TraversableStream(..)
|
||||||
,VisualStream(..)
|
,VisualStream(..)
|
||||||
,ErrorItem(Tokens)
|
--,ErrorItem(Tokens)
|
||||||
|
|
||||||
,initialPos
|
|
||||||
,sourceLine
|
,sourceLine
|
||||||
|
|
||||||
,ParseErrorBundle(..)
|
,ParseErrorBundle(..)
|
||||||
|
@ -225,7 +224,7 @@ import qualified Control.Monad.Combinators.Expr as E
|
||||||
import qualified Control.Monad.Permutations as P
|
import qualified Control.Monad.Permutations as P
|
||||||
|
|
||||||
import Control.Monad.Reader
|
import Control.Monad.Reader
|
||||||
(Reader(..)
|
(Reader
|
||||||
,runReader
|
,runReader
|
||||||
,ask
|
,ask
|
||||||
)
|
)
|
||||||
|
@ -233,14 +232,13 @@ import Control.Monad.Reader
|
||||||
import qualified Data.List as DL
|
import qualified Data.List as DL
|
||||||
import qualified Data.List.NonEmpty as NE
|
import qualified Data.List.NonEmpty as NE
|
||||||
import qualified Data.Set as Set
|
import qualified Data.Set as Set
|
||||||
import Control.Monad.Identity (Identity)
|
|
||||||
import Data.Proxy (Proxy(..))
|
import Data.Proxy (Proxy(..))
|
||||||
import Data.Void (Void)
|
import Data.Void (Void)
|
||||||
|
|
||||||
import Control.Monad (guard, void)
|
import Control.Monad (guard, void)
|
||||||
import Control.Applicative ((<**>))
|
import Control.Applicative ((<**>))
|
||||||
import Data.Char (toLower, isDigit)
|
import Data.Char (isDigit)
|
||||||
import Data.List (intercalate,sort,groupBy)
|
import Data.List (sort,groupBy)
|
||||||
import Data.Function (on)
|
import Data.Function (on)
|
||||||
import Data.Maybe (catMaybes, isJust)
|
import Data.Maybe (catMaybes, isJust)
|
||||||
import Data.Text (Text)
|
import Data.Text (Text)
|
||||||
|
@ -1239,15 +1237,15 @@ opTable bExpr =
|
||||||
|
|
||||||
]
|
]
|
||||||
where
|
where
|
||||||
binarySymL name = E.InfixL (mkBinOp name <$ symbol_ name)
|
binarySymL nm = E.InfixL (mkBinOp nm <$ symbol_ nm)
|
||||||
binarySymR name = E.InfixR (mkBinOp name <$ symbol_ name)
|
binarySymR nm = E.InfixR (mkBinOp nm <$ symbol_ nm)
|
||||||
binarySymN name = E.InfixN (mkBinOp name <$ symbol_ name)
|
binarySymN nm = E.InfixN (mkBinOp nm <$ symbol_ nm)
|
||||||
binaryKeywordN name = E.InfixN (mkBinOp name <$ keyword_ name)
|
binaryKeywordN nm = E.InfixN (mkBinOp nm <$ keyword_ nm)
|
||||||
binaryKeywordL name = E.InfixL (mkBinOp name <$ keyword_ name)
|
binaryKeywordL nm = E.InfixL (mkBinOp nm <$ keyword_ nm)
|
||||||
mkBinOp nm a b = BinOp a (mkName nm) b
|
mkBinOp nm a b = BinOp a (mkNm nm) b
|
||||||
prefixSym name = E.Prefix (PrefixOp (mkName name) <$ symbol_ name)
|
prefixSym nm = E.Prefix (PrefixOp (mkNm nm) <$ symbol_ nm)
|
||||||
prefixKeyword name = E.Prefix (PrefixOp (mkName name) <$ keyword_ name)
|
prefixKeyword nm = E.Prefix (PrefixOp (mkNm nm) <$ keyword_ nm)
|
||||||
mkName nm = [Name Nothing nm]
|
mkNm nm = [Name Nothing nm]
|
||||||
binaryKeywordsN p =
|
binaryKeywordsN p =
|
||||||
E.InfixN (do
|
E.InfixN (do
|
||||||
o <- try p
|
o <- try p
|
||||||
|
@ -2161,11 +2159,6 @@ other operators so it can be used nicely
|
||||||
(<??>) :: Parser a -> Parser (a -> a) -> Parser a
|
(<??>) :: Parser a -> Parser (a -> a) -> Parser a
|
||||||
p <??> q = p <**> option id q
|
p <??> q = p <**> option id q
|
||||||
|
|
||||||
(<??.>) :: Parser (a -> a) -> Parser (a -> a) -> Parser (a -> a)
|
|
||||||
(<??.>) pa pb = (.) `c` pa <*> option id pb
|
|
||||||
-- todo: fix this mess
|
|
||||||
where c = (<$>) . flip
|
|
||||||
|
|
||||||
-- 0 to many repeated applications of suffix parser
|
-- 0 to many repeated applications of suffix parser
|
||||||
|
|
||||||
(<??*>) :: Parser a -> Parser (a -> a) -> Parser a
|
(<??*>) :: Parser a -> Parser (a -> a) -> Parser a
|
||||||
|
@ -2482,5 +2475,3 @@ pxy = Proxy
|
||||||
showMyToken :: L.Token -> String
|
showMyToken :: L.Token -> String
|
||||||
-- todo: how to do this properly?
|
-- todo: how to do this properly?
|
||||||
showMyToken = T.unpack . L.prettyToken ansi2011
|
showMyToken = T.unpack . L.prettyToken ansi2011
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -37,7 +37,6 @@ import qualified Prettyprinter as P
|
||||||
import Prettyprinter.Render.Text (renderStrict)
|
import Prettyprinter.Render.Text (renderStrict)
|
||||||
|
|
||||||
import Data.Maybe (maybeToList, catMaybes)
|
import Data.Maybe (maybeToList, catMaybes)
|
||||||
import Data.List (intercalate)
|
|
||||||
|
|
||||||
import qualified Data.Text as T
|
import qualified Data.Text as T
|
||||||
import Data.Text (Text)
|
import Data.Text (Text)
|
||||||
|
|
|
@ -36,7 +36,6 @@ common shared-properties
|
||||||
build-depends: base >=4 && <5,
|
build-depends: base >=4 && <5,
|
||||||
megaparsec >=9.6 && <9.7,
|
megaparsec >=9.6 && <9.7,
|
||||||
parser-combinators >= 1.3 && < 1.4,
|
parser-combinators >= 1.3 && < 1.4,
|
||||||
parsec,
|
|
||||||
mtl >=2.1 && <2.4,
|
mtl >=2.1 && <2.4,
|
||||||
prettyprinter >= 1.7 && < 1.8,
|
prettyprinter >= 1.7 && < 1.8,
|
||||||
text >= 2.1 && < 2.2,
|
text >= 2.1 && < 2.2,
|
||||||
|
|
|
@ -118,9 +118,9 @@ makeLexerTest d s ts = H.testCase (T.unpack s) $ do
|
||||||
|
|
||||||
makeLexingFailsTest :: Dialect -> Text -> T.TestTree
|
makeLexingFailsTest :: Dialect -> Text -> T.TestTree
|
||||||
makeLexingFailsTest d s = H.testCase (T.unpack s) $ do
|
makeLexingFailsTest d s = H.testCase (T.unpack s) $ do
|
||||||
undefined {-case lexSQL d "" Nothing s of
|
case Lex.lexSQL d "" Nothing s of
|
||||||
Right x -> H.assertFailure $ "lexing should have failed: " ++ s ++ "\ngot: " ++ show x
|
Right x -> H.assertFailure $ "lexing should have failed: " ++ T.unpack s ++ "\ngot: " ++ show x
|
||||||
Left _ -> return ()-}
|
Left _ -> pure ()
|
||||||
|
|
||||||
|
|
||||||
toTest :: (Eq a, Show a) =>
|
toTest :: (Eq a, Show a) =>
|
||||||
|
|
Loading…
Reference in a new issue