7868148 · project-m36 · git.iko.soy

git.iko.soy/project-m36

add Show instances to various TutorialD operator data types to aid in debugging

commit786814854fbc40cbb74f07e5cae0e01596330731 authorAgentM <agentm@themactionfaction.com> dateWed 30 Nov 2016, 21:57 (10 years ago) parent6560e46

7 files changed+16

compare with master

unifiedsplit

src/bin/TutorialD/Interpreter.hs+1 src/bin/TutorialD/Interpreter/Export/Base.hs+4 src/bin/TutorialD/Interpreter/Import/Base.hs+7 src/bin/TutorialD/Interpreter/Import/BasicExamples.hs+1 src/bin/TutorialD/Interpreter/InformationOperator.hs+1 src/bin/TutorialD/Interpreter/SchemaOperator.hs+1 src/bin/TutorialD/Interpreter/TransGraphRelationalOperator.hs+1

src/bin/TutorialD/Interpreter.hs+1

@@ -50,6 +50,7 @@ data ParsedOperation = RODatabaseContextOp RODatabaseContextOperator |

5050 RelVarExportOp RelVarDataExportOperator |

5151 TransGraphRelationalOp TransGraphRelationalOperator |

5252 SchemaOp SchemaOperator

53+ deriving (Show)

5354

5455interpreterParserP :: Parser ParsedOperation

5556interpreterParserP = safeInterpreterParserP <|>

src/bin/TutorialD/Interpreter/Export/Base.hs+4

@@ -1,9 +1,13 @@

11module TutorialD.Interpreter.Export.Base where

22import ProjectM36.Base

33import ProjectM36.Error

4+import Data.Monoid

56data RelVarDataExportOperator = RelVarDataExportOperator RelationalExpr FilePath (RelVarDataExportOperator -> Relation -> IO (Maybe RelationalError))

8+instance Show RelVarDataExportOperator where

9+ show (RelVarDataExportOperator expr path _) = "RelVarDataExportOperator " <> show expr <> " " <> path

10+

711evalRelVarDataExportOperator :: RelVarDataExportOperator -> Relation -> IO (Maybe RelationalError)

812evalRelVarDataExportOperator op@(RelVarDataExportOperator _ _ exportFunc) rel = exportFunc op rel

913

src/bin/TutorialD/Interpreter/Import/Base.hs+7

@@ -1,13 +1,20 @@

11module TutorialD.Interpreter.Import.Base where

22import ProjectM36.Base

33import ProjectM36.Error

4+import Data.Monoid

56-- | import data into a relation variable

67data RelVarDataImportOperator = RelVarDataImportOperator RelVarName FilePath (RelVarName -> Attributes -> FilePath -> IO (Either RelationalError DatabaseContextExpr))

9+instance Show RelVarDataImportOperator where

10+ show (RelVarDataImportOperator rv path _) = "RelVarDataImportOperator " <> show rv <> " " <> path

11+

812-- | import data into a database context

913data DatabaseContextDataImportOperator = DatabaseContextDataImportOperator FilePath (FilePath -> IO (Either RelationalError DatabaseContextExpr))

1014

15+instance Show DatabaseContextDataImportOperator where

16+ show (DatabaseContextDataImportOperator path _) = "DatabaseContextDataImportOperator " <> path

17+

1118-- perhaps create a structure to import a whole transaction graph section in the future

1219

1320evalRelVarDataImportOperator :: RelVarDataImportOperator -> Attributes -> IO (Either RelationalError DatabaseContextExpr)

src/bin/TutorialD/Interpreter/Import/BasicExamples.hs+1

@@ -7,6 +7,7 @@ import TutorialD.Interpreter.Base

77import Text.Megaparsec.Text

99data ImportBasicExampleOperator = ImportBasicDateExampleOperator

10+ deriving (Show)

1011

1112evalImportBasicExampleOperator :: ImportBasicExampleOperator -> DatabaseContextExpr

1213evalImportBasicExampleOperator ImportBasicDateExampleOperator = databaseContextAsDatabaseContextExpr dateExamples

src/bin/TutorialD/Interpreter/InformationOperator.hs+1

@@ -9,6 +9,7 @@ import TutorialD.Interpreter.Base

1010data InformationOperator = HelpOperator |

1111 GetVersionOperator

12+ deriving (Show)

1213

1314infoOpP :: Parser InformationOperator

1415infoOpP = helpOpP <|> getVersionP

src/bin/TutorialD/Interpreter/SchemaOperator.hs+1

@@ -12,6 +12,7 @@ import TutorialD.Interpreter.Base

1212

1313data SchemaOperator = ModifySchemaExpr SchemaExpr |

1414 SetCurrentSchema SchemaName

15+ deriving Show

1516

1617schemaOperatorP :: Parser SchemaOperator

1718schemaOperatorP = (ModifySchemaExpr <$> schemaExprP) <|>

src/bin/TutorialD/Interpreter/TransGraphRelationalOperator.hs+1

@@ -17,6 +17,7 @@ instance RelationalMarkerExpr TransactionIdLookup where

1717 parseMarkerP = string "@" *> transactionIdLookupP

1818

1919data TransGraphRelationalOperator = ShowTransGraphRelation TransGraphRelationalExpr

20+ deriving Show

2021

2122transactionIdLookupP :: Parser TransactionIdLookup

2223transactionIdLookupP = (TransactionIdLookup <$> uuidP) <|>