New: support for boolean ops

.gitignore

@@ -5,7 +5,6 @@ a.py
 *.egg-info
 parser.out
 parsetab.py
-version.py
 dist/
 build/
 runtime/

setup.py

@@ -1,11 +1,7 @@
 import os
 from setuptools import setup
 
-try:
-    versionstring = os.popen("git describe").read().strip()
-    open("smop/version.py","w").write("__version__ = '%s'\n" % versionstring)
-except:
-    versionstring = "'0.26'"
+from smop.version import __version__
 
 setup(
     author = 'Victor Leikehman',
@@ -16,12 +12,12 @@
     url = 'https://github.com/victorlei/smop',
     download_url = 'https://github.com/victorlei/smop/archive/master.zip',
     name = 'smop',
-    version = versionstring,
+    version = __version__,
     entry_points = { 'console_scripts': [ 'smop = smop.main:main', ], },
     packages = ['smop'],
     #package_dir = {'':'src'},
     #test_suite = "smop.testsuite.test_lexer",
     #include_package_data = True,
     #package_data = { 'smop': ['*.m', 'Makefile'], },
-    install_requires = ['numpy', 'scipy', 'networkx'],
+    install_requires = ['ply', 'numpy', 'scipy', 'networkx', 'pygraphviz'],
 )

smop/backend.py

@@ -125,7 +125,18 @@ def _backend(self,level=0):
 
 @extend(node.expr)
 def _backend(self,level=0):
-    if self.op == '@': # FIXME
+    if self.op in ("!","not"): # ???
+       return "not %s" % self.args[0]
+    if self.op in ("&","and"):
+       return "logical_and(%s)" % self.args._backend()
+    if self.op == "&&":
+        return " and ".join(t._backend() for t in self.args)
+    if self.op in ("|","or"):
+        return "logical_or(%s)" % self.args._backend()
+    if self.op == "||":
+        return " or ".join(t._backend() for t in self.args)
+
+    if self.op == '@': # FIXMEj
         return self.args[0]._backend()
 
     if self.op == "\\":

smop/core.py

@@ -352,6 +352,9 @@ def abs(a):
 def all(a):
     return numpy.all(a)
 
+def any(a):
+    return numpy.any(a)
+
 def arange(start,stop,step=1,**kwargs):
     """
     >>> a=arange(1,10) # 1:10
@@ -390,6 +393,15 @@ def eig(a):
     u,v = np.linalg.eig(a)
     return u.T
 
+def logical_not(a):
+    return numpy.logical_not(a)
+
+def logical_and(a,b):
+    return numpy.logical_and(a,b)
+
+def logical_or(a,b):
+    return numpy.logical_or(a,b)
+
 def exist(a,b):
     if str(b) == 'builtin':
         return str(a) in globals()