Stylistic tweaks

diff --git a/.gitignore b/.gitignore
index 6629aa44bc841478ec4c00b36d22c165ce37bae6..9e0a9188759a3954cc7a16bca4fd936279b9def8 100644 (file)
--- 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 def8f9faf28e13fc5a95949a17bcd4b5b38c54fb..a65d0a45ef3a064ac4ba1064856b3f834df99131 100644 (file)
--- 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 ebd60274f9eb5136cda0814f6b36c44f15f73940..2bddccee413b1e86898e64bf901b11b620314d67 100644 (file)
--- 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 5e04aba5d51c3ebb2a5ab2752dcdbb70996c1ecc..860e47f39fd8de5298a29a07ec4ba10f84d25e38 100644 (file)
--- 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 23bdc677ec1605ad5e0dbf3d0308a907b28e7194..43a4258e54c7ecbbd05a5ed3764a8835c63e7228 100644 (file)
--- 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 4bc7d70f46343b92490bd1b4bffed209472f575f..1e410789f220c75b9577da655a3871c77ab07464 100644 (file)
--- 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