3c9dd47 · project-m36 · git.iko.soy

git.iko.soy/project-m36

address hlint suggestions

commit3c9dd478bbff0766550ab05c9036013af0ae4931 authorAgentM <agentm@themactionfaction.com> dateTue 15 May 2018, 11:22 (8 years ago) parenta52fc90

3 files changed+5−7

compare with master

unifiedsplit

src/lib/ProjectM36/AtomFunction.hs+1−2 src/lib/ProjectM36/Client.hs+2−2 src/lib/ProjectM36/DatabaseContextFunction.hs+2−3

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

@@ -72,8 +72,7 @@ createScriptedAtomFunction funcName argsType retType = AddAtomFunction funcName

7272 retType]])

7373

7474loadAtomFunctions :: ModName -> FuncName -> FilePath -> IO (Either LoadSymbolError [AtomFunction])

75−loadAtomFunctions modName funcName objPath = do

76− loadFunction modName funcName objPath

75+loadAtomFunctions = loadFunction

7776

7877atomFunctionsAsRelation :: AtomFunctions -> Either RelationalError Relation

7978atomFunctionsAsRelation funcs = mkRelationFromList attrs tups

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

@@ -923,7 +923,7 @@ atomFunctionsAsRelation sessionId (InProcessConnection conf) = do

923923 eSession <- sessionAndSchema sessionId sessions

924924 case eSession of

925925 Left err -> pure (Left err)

926− Right (session, _) -> do

926+ Right (session, _) ->

927927 pure (AF.atomFunctionsAsRelation (atomFunctions (concreteDatabaseContext session)))

928928

929929atomFunctionsAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveAtomFunctionSummary sessionId)

@@ -935,7 +935,7 @@ databaseContextFunctionsAsRelation sessionId (InProcessConnection conf) = do

935935 eSession <- sessionAndSchema sessionId sessions

936936 case eSession of

937937 Left err -> pure (Left err)

938− Right (session, _) -> do

938+ Right (session, _) ->

939939 pure (DCF.databaseContextFunctionsAsRelation (dbcFunctions (concreteDatabaseContext session)))

940940

941941databaseContextFunctionsAsRelation sessionId conn@(RemoteProcessConnection _) = remoteCall conn (RetrieveDatabaseContextFunctionSummary sessionId)

src/lib/ProjectM36/DatabaseContextFunction.hs+2−3

@@ -61,8 +61,7 @@ createScriptedDatabaseContextFunction :: DatabaseContextFunctionName -> [TypeCon

6161createScriptedDatabaseContextFunction funcName argsIn retArg = AddDatabaseContextFunction funcName (argsIn ++ [databaseContextFunctionReturnType retArg])

6262

6363loadDatabaseContextFunctions :: ModName -> FuncName -> FilePath -> IO (Either LoadSymbolError [DatabaseContextFunction])

64−loadDatabaseContextFunctions modName funcName objPath = do

65− loadFunction modName funcName objPath

64+loadDatabaseContextFunctions = loadFunction

6665

6766databaseContextFunctionsAsRelation :: DatabaseContextFunctions -> Either RelationalError Relation

6867databaseContextFunctionsAsRelation dbcFuncs = mkRelationFromList attrs tups

@@ -72,5 +71,5 @@ databaseContextFunctionsAsRelation dbcFuncs = mkRelationFromList attrs tups

7271 tups = map dbcFuncToTuple (HS.toList dbcFuncs)

7372 dbcFuncToTuple func = [TextAtom (dbcFuncName func),

7473 TextAtom (dbcTextType (dbcFuncType func))]

75− dbcTextType typ = T.intercalate " -> " ((map prettyAtomType typ) ++ ["DatabaseContext", "DatabaseContext"])

74+ dbcTextType typ = T.intercalate " -> " (map prettyAtomType typ ++ ["DatabaseContext", "DatabaseContext"])

7675