merge

diff --cc src/Dyna/Analysis/ANF.hs
Simple merge

diff --cc src/Dyna/Backend/Python.hs
index e6542880f903f93dff2247193c645609409ade63,b7152af03aadd3bfc9b5a24b396ae2000f6bdb19..3027b0ca1e4b0f38993bab51e6b2d40a0a24face
--- 1/src/Dyna/Backend/Python.hs
--- 2/src/Dyna/Backend/Python.hs
+++ b/src/Dyna/Backend/Python.hs
@@@ -117,9 -117,11 +117,9 @@@ combinePlans = go (M.empty
      nel (Just x) = x
  
  
 --- timv: consider flattening FRUle and ANFState
 -
  py (cruxf,cruxa) (FRule h _ _ r span _) dope =
             "@register" <> (parens $ dquotes $ pretty cruxf <> "/" <> (text $ show cruxa))
-    `above` "def _(_H, _V):"
+    `above` "def _(_h, _v):"
     `above` (indent 4 $ go dope)
  
   where
@@@ -169,10 -171,11 +169,10 @@@ processFile_ fileName fh = d
                  displayIO fh $ renderPretty 1.0 100
                            $ py fa r dope
                  hPutStrLn fh ""
 ---            hPutStrLn fh ""
  
   where
-   headVar = "_H"
-   valVar  = "_V"
+   headVar = "_h"
+   valVar  = "_v"
  
  
  -- TEST: processFile "examples/cky.dyna"