From: Tim Vieira <tim.f.vieira@gmail.com>
Date: Fri, 28 Jun 2013 21:12:03 +0000 (-0400)
Subject: merged
X-Git-Url: https://hydra-www.ietfng.org/gitweb/?a=commitdiff_plain;h=6022ddd023e105468c3284fa8ac1a2a428ba91ba;p=dyna2

merged
---

6022ddd023e105468c3284fa8ac1a2a428ba91ba
diff --cc src/Dyna/Backend/Python/Backend.hs
index e155443,160d3e7..74d4fac
--- a/src/Dyna/Backend/Python/Backend.hs
+++ b/src/Dyna/Backend/Python/Backend.hs
@@@ -140,19 -140,20 +140,21 @@@ constants = g
    go ("&",2)     = Just $ PDBS $ infixOp "&"
    go ("%",2)     = Just $ PDBS $ infixOp "%"
    go ("+",2)     = Just $ PDBS $ infixOp "+"
-   go ("mod",2)      = Just $ PDBS $ infixOp "%"
-   go ("abs",1)      = Just $ PDBS $ call "abs"
- 
-   go ("log",_)      = Just $ PDBS $ call "log"
-   go ("exp",1)      = Just $ PDBS $ call "exp"
-   go ("sqrt",1)     = Just $ PDBS $ call "sqrt"
-   go ("split", _)   = Just $ PDBS $ call "split"
-   go ("float", _)   = Just $ PDBS $ call "float"
-   go ("int", _)     = Just $ PDBS $ call "int"
-   go ("pycall", _)  = Just $ PDBS $ call "pycall"
-   go ("getattr", _) = Just $ PDBS $ call "getattr"
-   go ("uniform", _) = Just $ PDBS $ call "uniform"
+ 
+   go ("mod",2)   = Just $ PDBS $ infixOp "%"
+   go ("abs",1)   = Just $ PDBS $ call "abs" []
 -  go ("log",1)   = Just $ PDBS $ call "log" []
++  go ("log",_)   = Just $ PDBS $ call "log" []
+   go ("exp",1)   = Just $ PDBS $ call "exp" []
 -
 -
 -
 -  go ("pycall", _) = Just $ PDBS $ call "pycall" []
 -  go ("getattr", 2) = Just $ PDBS $ call "getattr" []
 -
 -
++  go ("sqrt",1)     = Just $ PDBS $ call "sqrt" []
++  go ("getattr", _) = Just $ PDBS $ call "getattr" []
+   go ("uniform", _) = Just $ PDBS $ call "uniform" []
+ 
++  go ("split", _)   = Just $ PDBS $ call "split" []
++  go ("float", _)   = Just $ PDBS $ call "float" []
++  go ("int", _)     = Just $ PDBS $ call "int" []
++  go ("getattr", _) = Just $ PDBS $ call "getattr" []
++  go ("pycall", _)  = Just $ PDBS $ call "pycall" []
 +
    go ("<=",2)    = Just $ PDBS $ infixOp "<="
    go ("<",2)     = Just $ PDBS $ infixOp "<"
    go ("=",2)     = Just $ PDBS $ infixOp "=="