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

add tests for + - followed by comment edge cases

Browse source
This commit is contained in:
Jake Wheat 2016-02-13 20:38:49 +02:00
parent fc2119be02
commit 47198c78c1
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Language/SQL/SimpleSQL/Lex.lhs
View file

@ -370,7 +370,6 @@ which allows the last character of a multi character symbol to be + or
> -- special case for parsing a single + or - symbol > -- special case for parsing a single + or - symbol
> singlePlusMinus = try $ do > singlePlusMinus = try $ do
> c <- oneOf "+-" > c <- oneOf "+-"
> -- todo: make sure it deals with e.g. --- +-- +/* -/*?
> notFollowedBy $ oneOf allOpSymbols > notFollowedBy $ oneOf allOpSymbols
> return [c] > return [c]

10
tools/Language/SQL/SimpleSQL/LexerTests.lhs
View file

@ -284,7 +284,9 @@ the + or -.
> [LexerTest postgres s t | (s,t) <- postgresLexerTable] > [LexerTest postgres s t | (s,t) <- postgresLexerTable]
> ,Group "adhoc lexer tests" $ > ,Group "adhoc lexer tests" $
> [LexerTest postgres s t > [LexerTest postgres s t
> | (s,t) <- edgeCaseCommentOps ++ edgeCasePlusMinusOps ] > | (s,t) <- edgeCaseCommentOps
> ++ edgeCasePlusMinusOps
> ++ edgeCasePlusMinusComments]
> ] > ]
> where > where
> edgeCaseCommentOps = concat > edgeCaseCommentOps = concat
@ -298,6 +300,12 @@ the + or -.
> , (x ++ "-", [Symbol x, Symbol "-"]) ] > , (x ++ "-", [Symbol x, Symbol "-"]) ]
> | x <- somePostgresOpsWhichWontAddTrailingPlusMinus 2 > | x <- somePostgresOpsWhichWontAddTrailingPlusMinus 2
> ] > ]
> edgeCasePlusMinusComments =
> [("---", [LineComment "---"])
> ,("+--", [Symbol "+", LineComment "--"])
> ,("-/**/", [Symbol "-", BlockComment "/**/"])
> ,("+/**/", [Symbol "+", BlockComment "/**/"])
> ]
> combos :: [a] -> Int -> [[a]] > combos :: [a] -> Int -> [[a]]