New: prettier printing of faulty ArgumentValues fact map

HN/Optimizer/Visualise.hs

@@ -1,8 +1,9 @@
 {-# LANGUAGE GADTs #-}
 module HN.Optimizer.Visualise where
-
+import Compiler.Hoopl
+import Data.Functor.Foldable
 import HN.Optimizer.Node
-import Data.Functor.Fixedpoint
+import Utils
 
 instance Show (Node e x) where
 	show (Entry l) = show l
@@ -20,4 +21,22 @@ instance Show a => Show (ExpressionFunctor a) where
 	show e = case e of
 		Constant c -> show c
 		Atom aa -> show aa
-		Application a b -> show a ++ concatMap (\b -> ' ' : show b) b
+		Application a b -> show a ++ concatMap (\b -> ' ' : show b) b
+
+foo x = concatMap ff $ mapToList x where
+	ff (l, x) = show l ++ " => " ++ case x of
+
+		Top -> "T\n"
+		Bot -> "⊥\n"
+		PElem x -> concatMap bar x ++ "\n"
+
+bar x = case x of
+		Top -> "T\n"
+		Bot -> "⊥\n"
+		PElem x -> cata phi x ++ " "
+
+phi x = case x of
+	Atom x -> show x
+	Constant x -> show x
+	Application a b -> "(" ++ a ++ " " ++ joinStr " " b ++ ")"
+

Test/Optimizer/ArgumentValues.hs

@@ -2,14 +2,14 @@
 import CPP.CompileTools
 import HN.Optimizer.ArgumentValues
 import HN.Optimizer.GraphCompiler
-import HN.Optimizer.Visualise ()
+import HN.Optimizer.Visualise
 import FFI.TypeParser
 import Compiler.Hoopl
 
 main = do
 	ast <- parseHN "hn_tests/print15.hn"
 	ffi <- importHni "lib/lib.hni"
-	print $ run avPass $ fst $ compileGraph ffi $ head ast
+	putStrLn $ foo $ run avPass $ fst $ compileGraph ffi $ head ast
 
 run pass graph = case runSimpleUniqueMonad . runWithFuel infiniteFuel $ 
 	analyzeAndRewriteFwd pass entry graph $