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

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

compare with master

unifiedsplit

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

72 retType]])

73

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

75−loadAtomFunctions modName funcName objPath = do

75+loadAtomFunctions = loadFunction

76− loadFunction modName funcName objPath

77

76

78atomFunctionsAsRelation :: AtomFunctions -> Either RelationalError Relation

77atomFunctionsAsRelation :: AtomFunctions -> Either RelationalError Relation

79atomFunctionsAsRelation funcs = mkRelationFromList attrs tups

78atomFunctionsAsRelation funcs = mkRelationFromList attrs tups

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

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

923 eSession <- sessionAndSchema sessionId sessions

924 case eSession of

925 Left err -> pure (Left err)

926− Right (session, _) -> do

926+ Right (session, _) ->

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

928

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

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

935 eSession <- sessionAndSchema sessionId sessions

936 case eSession of

937 Left err -> pure (Left err)

938− Right (session, _) -> do

938+ Right (session, _) ->

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

940

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

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

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

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

62

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

64−loadDatabaseContextFunctions modName funcName objPath = do

64+loadDatabaseContextFunctions = loadFunction

65− loadFunction modName funcName objPath

66

65

67databaseContextFunctionsAsRelation :: DatabaseContextFunctions -> Either RelationalError Relation

66databaseContextFunctionsAsRelation :: DatabaseContextFunctions -> Either RelationalError Relation

68databaseContextFunctionsAsRelation dbcFuncs = mkRelationFromList attrs tups

67databaseContextFunctionsAsRelation dbcFuncs = mkRelationFromList attrs tups

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

72 tups = map dbcFuncToTuple (HS.toList dbcFuncs)

71 tups = map dbcFuncToTuple (HS.toList dbcFuncs)

73 dbcFuncToTuple func = [TextAtom (dbcFuncName func),

72 dbcFuncToTuple func = [TextAtom (dbcFuncName func),

74 TextAtom (dbcTextType (dbcFuncType func))]

73 TextAtom (dbcTextType (dbcFuncType func))]

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

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

76

75