diff options
| -rw-r--r-- | Parse.hs | 15 | ||||
| -rw-r--r-- | WriteProof.hs | 13 |
2 files changed, 15 insertions, 13 deletions
@@ -7,7 +7,10 @@ module Parse ( isComment, isNumber, isName, - output + output, + fst3, + snd3, + thd3 ) where import Control.Monad( liftM ) @@ -62,3 +65,13 @@ output [] = return () output list = do putStrLn (head list) output (tail list) + + +fst3 :: (a,b,c) -> a +fst3 (a,_,_) = a + +snd3 :: (a,b,c) -> b +snd3 (_,b,_) = b + +thd3 :: (a,b,c) -> c +thd3 (_,_,c) = c diff --git a/WriteProof.hs b/WriteProof.hs index 3d0e095..2397de9 100644 --- a/WriteProof.hs +++ b/WriteProof.hs @@ -17,7 +17,7 @@ import qualified Data.Map as Map import Data.List import Stack( Stack, at, (<:>) ) import qualified Stack as Stack -import Parse( isNumber ) +import Parse( isNumber, fst3, snd3, thd3 ) @@ -65,17 +65,6 @@ subGraph graph node = -fst3 :: (a,b,c) -> a -fst3 (a,_,_) = a - -snd3 :: (a,b,c) -> b -snd3 (_,b,_) = b - -thd3 :: (a,b,c) -> c -thd3 (_,_,c) = c - - - orderNodes :: Gr String (Int,Int) -> [Node] -> [Node] orderNodes graph nodeList = nodeList --placeholder |