Pretty-print usages

src/Main.hs

@@ -10,6 +10,7 @@ import SixtyPical.Model
 import SixtyPical.Parser (parseProgram)
 import SixtyPical.Checker (checkAndTransformProgram)
 import SixtyPical.Analyzer (analyzeProgram)
+import SixtyPical.Context (ppAnalysis)
 import SixtyPical.Emitter (emitProgram)
 
 -- -- -- -- driver -- -- -- --
@@ -33,7 +34,7 @@ main = do
                 ("analyze", Right program) ->
                     case checkAndTransformProgram program of
                         Just newprog ->
-                            putStrLn $ show $ analyzeProgram newprog
+                            ppAnalysis $ analyzeProgram newprog
                 ("emit", Right program) ->
                     case checkAndTransformProgram program of
                         Just newprog ->

src/SixtyPical/Analyzer.hs

@@ -35,6 +35,7 @@ checkInstr (COPY src dst) progCtx routCtx =
     -- TODO check that src is not poisoned
     Map.insert dst (UpdatedWith src) routCtx
 checkInstr (DELTA dst val) progCtx routCtx =
+    -- TODO check that dst is not poisoned
     Map.insert dst (UpdatedWith (Immediate val)) routCtx
 checkInstr (JSR name) progCtx routCtx =
     case Map.lookup name progCtx of

src/SixtyPical/Context.hs

@@ -42,3 +42,29 @@ mergeRoutCtxs routCtx calledRoutCtx =
                     Map.insert location (PoisonedWith ulocation) routCtxAccum
     in
         Map.foldrWithKey (poison) routCtx calledRoutCtx
+
+
+ppAnalysis :: ProgramContext -> IO ()
+ppAnalysis progCtx =
+    let
+        li = Map.toList progCtx
+    in do
+        ppRoutines li
+
+ppRoutines [] = return ()
+ppRoutines ((name, routCtx):rest) = do
+    putStrLn $ name
+    ppRoutine routCtx
+    putStrLn ""
+    ppRoutines rest
+
+ppRoutine routCtx =
+    let
+        li = Map.toList routCtx
+    in do
+        ppUsages li
+
+ppUsages [] = return ()
+ppUsages ((loc, usage):rest) = do
+    putStrLn $ ("  " ++ (show loc) ++ ": " ++ (show usage))
+    ppUsages rest