git.iko.soy/project-m36
on master help sign in
interpret QuietSuccessResult properly
76d384cAgentM
TutorialDInterpreter.hs+5−3
compare with master
unifiedsplit
@@ -365,7 +365,7 @@ data TutorialDOperatorResult = QuitResult |
365 DisplayResult String |
365 DisplayResult String |
366 DisplayErrorResult String |
366 DisplayErrorResult String |
367 QuietSuccessResult |
367 QuietSuccessResult |
368− NoActionResult
368+ NoActionResult --refactor to make this dead- there should be only one parser
369
369
370evalContextOp :: DatabaseContext -> ContextOperator -> TutorialDOperatorResult
370evalContextOp :: DatabaseContext -> ContextOperator -> TutorialDOperatorResult
371evalContextOp context (ShowRelationType expr) = case runState (typeForRelationalExpr expr) context of
371evalContextOp context (ShowRelationType expr) = case runState (typeForRelationalExpr expr) context of
@@ -395,7 +395,7 @@ evalGraphOp :: U.UUID -> DisconnectedTransaction -> TransactionGraph -> GraphOpe
395--affects only disconncted transaction
395--affects only disconncted transaction
396evalGraphOp newUUID trans graph (JumpToTransaction jumpUUID) = case transactionForUUID jumpUUID graph of
396evalGraphOp newUUID trans graph (JumpToTransaction jumpUUID) = case transactionForUUID jumpUUID graph of
397 Left err -> Left err
397 Left err -> Left err
398− Right parentTrans -> Right (newTrans, graph, QuietSuccessResult)
398+ Right parentTrans -> Right (newTrans, graph, NoActionResult)
399 where
399 where
400 newTrans = DisconnectedTransaction jumpUUID (transactionContext parentTrans)
400 newTrans = DisconnectedTransaction jumpUUID (transactionContext parentTrans)
401
401
@@ -440,7 +440,6 @@ evalGraphOp newTransUUID discon@(DisconnectedTransaction parentUUID context) gra
440 Right (_, updatedGraph) -> Right (newDisconnectedTrans, updatedGraph, QuietSuccessResult)
440 Right (_, updatedGraph) -> Right (newDisconnectedTrans, updatedGraph, QuietSuccessResult)
441 where
441 where
442 newDisconnectedTrans = newDisconnectedTransaction newTransUUID context
442 newDisconnectedTrans = newDisconnectedTransaction newTransUUID context
443− --parentTransaction = transactionForUUID parentUUID graph
444 maybeUpdatedGraph = addDisconnectedTransaction newTransUUID headName discon graph
443 maybeUpdatedGraph = addDisconnectedTransaction newTransUUID headName discon graph
445
444
446-- refresh the disconnected transaction, return the same graph
445-- refresh the disconnected transaction, return the same graph
@@ -498,6 +497,9 @@ reprLoop currentTransaction@(DisconnectedTransaction currentParentUUID currentCo
498 (updatedTrans, updatedGraph, DisplayResult out) -> do
497 (updatedTrans, updatedGraph, DisplayResult out) -> do
499 putStrLn out
498 putStrLn out
500 reprLoop updatedTrans updatedGraph
499 reprLoop updatedTrans updatedGraph
500+ (updatedTrans, updatedGraph, QuietSuccessResult) -> do
501+ putStrLn "Done."
502+ reprLoop updatedTrans updatedGraph
501 (_, _, NoActionResult) -> do
503 (_, _, NoActionResult) -> do
502 let (value, contextup) = interpret currentContext line
504 let (value, contextup) = interpret currentContext line
503 let updatedTransaction = DisconnectedTransaction currentParentUUID contextup
505 let updatedTransaction = DisconnectedTransaction currentParentUUID contextup