git.iko.soy/project-m36
on master help sign in
modified indentation
c12bae8iko
src/bin/TutorialD/Interpreter/Base.hs+5−6
compare with master
unifiedsplit
@@ -62,14 +62,13 @@ displayOpResult (DisplayRelationResult rel) = do
62 let randomlySortedRel = evalRand (randomizeTupleOrder rel) gen
62 let randomlySortedRel = evalRand (randomizeTupleOrder rel) gen
63 TIO.putStrLn (showRelation randomlySortedRel)
63 TIO.putStrLn (showRelation randomlySortedRel)
64displayOpResult (DisplayParseErrorResult mPromptLength err) = do
64displayOpResult (DisplayParseErrorResult mPromptLength err) = do
65− let
66− #if __GLASGOW_HASKELL__ >= 806
65+#if __GLASGOW_HASKELL__ >= 806
67− errorIndent = errorOffset . NE.head . bundleErrors $ err
66+ let errorIndent = errorOffset . NE.head . bundleErrors $ err
68 errString = T.pack (parseErrorPretty . NE.head . bundleErrors $ err)
67 errString = T.pack (parseErrorPretty . NE.head . bundleErrors $ err)
69− #else
68+#else
70− errorIndent = unPos (sourceColumn (NE.head (errorPos err)))
69+ let errorIndent = unPos (sourceColumn (NE.head (errorPos err)))
71 errString = T.pack (parseErrorPretty err)
70 errString = T.pack (parseErrorPretty err)
72− #endif
71+#endif
73 pointyString len = T.justifyRight (len + fromIntegral errorIndent) '_' "^"
72 pointyString len = T.justifyRight (len + fromIntegral errorIndent) '_' "^"
74 maybe (pure ()) (TIO.putStrLn . pointyString) mPromptLength
73 maybe (pure ()) (TIO.putStrLn . pointyString) mPromptLength
75 TIO.putStr ("ERR:" <> errString)
74 TIO.putStr ("ERR:" <> errString)