git.iko.soy/project-m36
on master help sign in
strip NoOperation from multiline datatabase expr parser
commit3004be0dc179d4bc6e473d2988bb83be4cf19ab4 authorAgentM <agentm@themactionfaction.com> dateFri 2 Apr 2021, 00:53 (6 years ago) parent744adba
2 files changed+4−3
compare with master
unifiedsplit
src/bin/TutorialD/Interpreter/DatabaseContextExpr.hs+3−2 test/TutorialD/Interpreter/Import/TutorialD.hs+1−1
src/bin/TutorialD/Interpreter/DatabaseContextExpr.hs+3−2
@@ -53,8 +53,9 @@ multilineSep :: Parser T.Text
5353multilineSep = newline >> pure "\n"
5454
5555multipleDatabaseContextExprP :: Parser DatabaseContextExpr
56−multipleDatabaseContextExprP =
57− MultipleExpr <$> sepBy1 databaseContextExprP semi
56+multipleDatabaseContextExprP = do
57+ exprs <- filter (/= NoOperation) <$> sepBy1 databaseContextExprP semi
58+ pure (MultipleExpr exprs)
5859
5960insertP :: Parser DatabaseContextExpr
6061insertP = do
test/TutorialD/Interpreter/Import/TutorialD.hs+1−1
@@ -33,7 +33,7 @@ testTutdFileImport = TestCase $
3333testTutdHTTPSImport :: Test
3434testTutdHTTPSImport = TestCase $ do
3535 uri <- mkURI "https://raw.githubusercontent.com/agentm/project-m36/master/test/TutorialD/Interpreter/Import/httpimporttest.tutd"
36− let hash = "bae2e29414d9d72e920182185d2b62aefc12aed1cc47b3b330b0e7de7432d831"
36+ let hash = "effe32b247586dc3ac0079fc241b9618d41d189afcaeb7907edbe5a8b45992a4"
3737 expected = Right (MultipleExpr [Assign "x" (RelationVariable "true" ()),Assign "y" (RelationVariable "false" ())])
3838 actual <- importTutorialDViaHTTP uri (Just hash)
3939 assertEqual "github https" expected actual