04735e8 · project-m36 · git.iko.soy

git.iko.soy/project-m36

implement hlint suggestions

commit04735e8906d2785e6c416ab903f96633f5333cac authorAgentM <agentm@themactionfaction.com> dateSun 10 May 2020, 23:47 (6 years ago) parentd9167fa

3 files changed+5−6

compare with master

unifiedsplit

src/bin/TutorialD/Interpreter/SchemaOperator.hs+3−3 src/lib/ProjectM36/Client.hs+1−2 test/Relation/Tupleable.hs+1−1

src/bin/TutorialD/Interpreter/SchemaOperator.hs+3−3

@@ -42,7 +42,7 @@ isoRestrictP = do

4242 reserved "isorestrict"

4343 relVarIn <- qrelVarP

4444 relvarsOut <- isoRestrictOutRelVarsP

45− IsoRestrict <$> pure relVarIn <*> restrictionPredicateP <*> pure relvarsOut

45+ IsoRestrict relVarIn <$> restrictionPredicateP <*> pure relvarsOut

4646

4747isoRestrictOutRelVarsP :: Parser (RelVarName, RelVarName)

4848isoRestrictOutRelVarsP = (,) <$> qrelVarP <*> qrelVarP

@@ -55,7 +55,7 @@ isoUnionP = do

5555 reserved "isounion"

5656 relVarsIn <- isoUnionInRelVarsP

5757 relVarsOut <- qrelVarP

58− IsoUnion <$> pure relVarsIn <*> restrictionPredicateP <*> pure relVarsOut

58+ IsoUnion relVarsIn <$> restrictionPredicateP <*> pure relVarsOut

5959

6060isoRenameP :: Parser SchemaIsomorph

6161isoRenameP = do

@@ -74,4 +74,4 @@ isoUnionInRelVarsP = (,) <$> qrelVarP <*> qrelVarP

7474evalSchemaOperator :: SessionId -> Connection -> SchemaOperator -> IO (Either RelationalError ())

7575evalSchemaOperator sessionId conn (ModifySchemaExpr expr) = executeSchemaExpr sessionId conn expr

7676evalSchemaOperator sessionId conn (SetCurrentSchema sname) = setCurrentSchemaName sessionId conn sname

77−

77+

src/lib/ProjectM36/Client.hs+1−2

@@ -1165,8 +1165,7 @@ executeDataFrameExpr sessionId conn@(InProcessConnection _) dfExpr = do

11651165 Left err -> pure (Left err)

11661166 Right attrs -> do

11671167 let attrOrders = zipWith

1168− (\attr' order'

1169− -> DF.AttributeOrder (attributeName attr') order')

1168+ (DF.AttributeOrder . attributeName)

11701169 attrs

11711170 orders

11721171 case DF.sortDataFrameBy attrOrders . DF.toDataFrame $ rel of

test/Relation/Tupleable.hs+1−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE DeriveGeneric, FlexibleInstances, FlexibleContexts, TypeOperators, DeriveAnyClass #-}

1+{-# LANGUAGE DeriveGeneric, FlexibleInstances, FlexibleContexts, DeriveAnyClass #-}

22import Test.HUnit

33import ProjectM36.Tupleable

44import ProjectM36.Atomable