git.iko.soy/project-m36
on master help sign in
make hlint changes
4b4c0d9AgentM
src/bin/TutorialD/Interpreter/RelationalExpr.hs+2−3
compare with master
unifiedsplit
@@ -240,13 +240,12 @@ withMacroExprP :: RelationalMarkerExpr a => Parser (RelationalExprBase a)
240withMacroExprP = do
240withMacroExprP = do
241 reservedOp "with"
241 reservedOp "with"
242 views <- parens (sepBy1 createViewP comma)
242 views <- parens (sepBy1 createViewP comma)
243− expr <- relExprP
244− pure $ With views expr
243+ With views <$> relExprP
245
244
246createViewP :: RelationalMarkerExpr a => Parser (RelVarName, RelationalExprBase a)
245createViewP :: RelationalMarkerExpr a => Parser (RelVarName, RelationalExprBase a)
247createViewP = do
246createViewP = do
248 name <- identifier
247 name <- identifier
249 reservedOp "as"
248 reservedOp "as"
250 expr <- relExprP
249 expr <- relExprP
251− pure $ (name, expr)
250+ pure (name, expr)
252
251
src/lib/ProjectM36/RelationalExpression.hs+1−1
@@ -227,7 +227,7 @@ evalRelationalExpr (With views mainExpr) = do
227 case foldM addScopedView (stateElemsContext rstate) views of
227 case foldM addScopedView (stateElemsContext rstate) views of
228 Left err -> return $ Left err
228 Left err -> return $ Left err
229 Right ctx'' -> do
229 Right ctx'' -> do
230− let evalMainExpr = \expr -> runReader (evalRelationalExpr expr) (RelationalExprStateElems ctx'')
230+ let evalMainExpr expr = runReader (evalRelationalExpr expr) (RelationalExprStateElems ctx'')
231 case evalMainExpr mainExpr of
231 case evalMainExpr mainExpr of
232 Left err -> return $ Left err
232 Left err -> return $ Left err
233 Right rel -> return $ Right rel
233 Right rel -> return $ Right rel