4b4c0d9 · project-m36 · git.iko.soy

git.iko.soy/project-m36

make hlint changes

commit4b4c0d969f161c7fc1057b952e7edbc8a20efb7a authorAgentM <agentm@themactionfaction.com> dateWed 25 Jul 2018, 23:56 (8 years ago) parent6111028

2 files changed+3−4

unifiedsplit

src/bin/TutorialD/Interpreter/RelationalExpr.hs+2−3

@@ -240,13 +240,12 @@ withMacroExprP :: RelationalMarkerExpr a => Parser (RelationalExprBase a)

240240withMacroExprP = do

241241 reservedOp "with"

242242 views <- parens (sepBy1 createViewP comma)

243− expr <- relExprP

244− pure $ With views expr

243+ With views <$> relExprP

245244

246245createViewP :: RelationalMarkerExpr a => Parser (RelVarName, RelationalExprBase a)

247246createViewP = do

248247 name <- identifier

249248 reservedOp "as"

250249 expr <- relExprP

251− pure $ (name, expr)

250+ pure (name, expr)

252251

src/lib/ProjectM36/RelationalExpression.hs+1−1

@@ -227,7 +227,7 @@ evalRelationalExpr (With views mainExpr) = do

227227 case foldM addScopedView (stateElemsContext rstate) views of

228228 Left err -> return $ Left err

229229 Right ctx'' -> do

230− let evalMainExpr = \expr -> runReader (evalRelationalExpr expr) (RelationalExprStateElems ctx'')

230+ let evalMainExpr expr = runReader (evalRelationalExpr expr) (RelationalExprStateElems ctx'')

231231 case evalMainExpr mainExpr of

232232 Left err -> return $ Left err

233233 Right rel -> return $ Right rel