From ae009831dd3965c44790cd4307ed78a8cd64630d Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwf@cs.jhu.edu>
Date: Tue, 18 Jun 2013 02:34:51 -0400
Subject: [PATCH] Stylistic tweaks

---
 .gitignore                     | 2 ++
 Makefile                       | 6 +++++-
 README.md                      | 2 +-
 src/Dyna/Analysis/ANFPretty.hs | 3 +++
 src/Dyna/Analysis/RuleMode.hs  | 4 ----
 test/repl/load.dyna            | 3 +--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6629aa4..9e0a918 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,5 +13,7 @@ examples/*.out
 docs/sphinx/_build
 
 test/*/*.out
+test/*/*.plan
+test/*/*.plan.py
 
 libpeerconnection.log
diff --git a/Makefile b/Makefile
index def8f9f..a65d0a4 100644
--- a/Makefile
+++ b/Makefile
@@ -25,8 +25,12 @@ test tests: build
 .PHONY: clean veryclean
 clean:
 	rm -rf examples/*.dyna.*.plan  \
+           examples/*.dyna.*.planc \
+           examples/*.dyna.plan.py \
+           examples/*.dyna.plan.pyc \
            examples/*.dyna.*.out \
-           examples/*.dyna.d
+           examples/*.dyna.d \
+           examples/*.hist
 	rm -rf test/*/*.out
 	rm -f tags TAGS
 veryclean: clean
diff --git a/README.md b/README.md
index ebd6027..2bddcce 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ You'll want to have the following programs installed:
 
 The python modules required
 
-    $ easy_install numpy ipython pygments path.py
+    $ easy_install numpy ipython pygments path.py matplotlib
 
 You should probably run
 
diff --git a/src/Dyna/Analysis/ANFPretty.hs b/src/Dyna/Analysis/ANFPretty.hs
index 5e04aba..860e47f 100644
--- a/src/Dyna/Analysis/ANFPretty.hs
+++ b/src/Dyna/Analysis/ANFPretty.hs
@@ -1,4 +1,7 @@
+---------------------------------------------------------------------------
+-- | Pretty-printer for ANF
 
+-- Header material                                                      {{{
 module Dyna.Analysis.ANFPretty (renderANF, renderCruxes) where
 
 import           Data.Either
diff --git a/src/Dyna/Analysis/RuleMode.hs b/src/Dyna/Analysis/RuleMode.hs
index 23bdc67..43a4258 100644
--- a/src/Dyna/Analysis/RuleMode.hs
+++ b/src/Dyna/Analysis/RuleMode.hs
@@ -63,10 +63,6 @@ import           Dyna.XXX.Trifecta (prettySpanLoc)
 -- import           Dyna.XXX.TrifectaTest
 import           Text.PrettyPrint.Free
 
--- XXX Aaaaany second now
--- import           Dyna.Analysis.Mode.Execution.Base
--- import           Dyna.Analysis.Mode.Execution.Functions
-
 ------------------------------------------------------------------------}}}
 -- Bindings                                                             {{{
 
diff --git a/test/repl/load.dyna b/test/repl/load.dyna
index 4bc7d70..1e41078 100644
--- a/test/repl/load.dyna
+++ b/test/repl/load.dyna
@@ -3,8 +3,7 @@
 % binary rules
 rewrite(X, Y, Z) :=
     rules_tsv(Linenum, Cost, X, R),
-    List is pycall("split", R, "\\s+"),
-    cons(Y, &cons(Z, &nil)) is List,
+    cons(Y, &cons(Z, &nil)) is pycall("split", R, "\\s+"),
     pycall("float", Cost).
 
 % load unary rules
-- 
2.50.1