Merge lp:~mwhudson/storm/unary-minus into lp:storm

[Michael Hudson-Doyle]

[Michael Hudson-Doyle (mwhudson)]

Hi there.

This simple branch lets you write -Table.column expressions naturally.

It's my first storm branch, so apologies if I'm doing something wrong...

Cheers,
mwh

[James Henstridge (jamesh)]

> Hi there.
>
> This simple branch lets you write -Table.column expressions naturally.
>
> It's my first storm branch, so apologies if I'm doing something wrong...

This looks pretty good. Could you please add a @compile_python.when(Neg) implementation too? That should be pretty simple, and will allow ResultSet.set() to handle those expressions without invalidating all the cached objects of that type.

review: Needs Fixing

[Michael Hudson-Doyle (mwhudson)]

> > Hi there.
> >
> > This simple branch lets you write -Table.column expressions naturally.
> >
> > It's my first storm branch, so apologies if I'm doing something wrong...
>
> This looks pretty good. Could you please add a @compile_python.when(Neg)
> implementation too? That should be pretty simple, and will allow
> ResultSet.set() to handle those expressions without invalidating all the
> cached objects of that type.

Like this?

=== modified file 'storm/expr.py'
--- storm/expr.py 2009-07-10 00:35:14 +0000
+++ storm/expr.py 2009-07-10 05:08:49 +0000
@@ -1277,6 +1277,10 @@
     __slots__ = ()
     prefix = "-"

+@compile_python.when(Neg)
+def compile_neg_expr(compile, expr, state):
+ return "-%s" % compile(expr.expr, state, raw=True)
+
 class Asc(SuffixExpr):
     __slots__ = ()
     suffix = "ASC"

=== modified file 'tests/expr.py'
--- tests/expr.py 2009-07-10 00:35:14 +0000
+++ tests/expr.py 2009-07-10 05:08:49 +0000
@@ -2120,6 +2120,11 @@
         py_expr = compile_python(expr)
         self.assertEquals(py_expr, "elem1+elem2+elem3+elem4")

+ def test_neg(self):
+ expr = Neg(elem1)
+ py_expr = compile_python(expr)
+ self.assertEquals(py_expr, "-elem1")
+
     def test_sub(self):
         expr = Sub(elem1, Sub(elem2, elem3))
         py_expr = compile_python(expr)

[lp:~mwhudson/storm/unary-minus]

314. By Michael Hudson-Doyle on 2009-07-10

add compile_python.when(Neg)

[James Henstridge (jamesh)]

> Like this?

Yep. Looks good.

review: Approve

[Michael Hudson-Doyle (mwhudson)]

Is there anything more I can do to get this moving along?

[Gustavo Niemeyer (niemeyer)]

Looks good! +1!

This has two reviews now, so it should be good for merging.

Do you have commit access to the project Michael? If not, would you like to become a committer?

review: Approve

[Michael Hudson-Doyle (mwhudson)]

> Looks good! +1!
>
> This has two reviews now, so it should be good for merging.

Yay.

> Do you have commit access to the project Michael?

No.

> If not, would you like to become a committer?

I can't promise to spend much time on Storm tbh, but I don't mind... I'm certainly happy for someone else to merge this change.

=== modified file 'storm/expr.py'
--- storm/expr.py	2009-06-18 15:05:18 +0000
+++ storm/expr.py	2009-07-10 05:20:10 +0000
@@ -473,6 +473,9 @@
             other = getattr(self, "variable_factory", Variable)(value=other)
         return Mod(self, other)
 
+    def __neg__(self):
+        return Neg(self)
+
     def is_in(self, others):
         if not isinstance(others, Expr):
             others = list(others)
@@ -1270,6 +1273,14 @@
     __slots__ = ()
     prefix = "EXISTS"
 
+class Neg(PrefixExpr):
+    __slots__ = ()
+    prefix = "-"
+
+@compile_python.when(Neg)
+def compile_neg_expr(compile, expr, state):
+    return "-%s" % compile(expr.expr, state, raw=True)
+
 class Asc(SuffixExpr):
     __slots__ = ()
     suffix = "ASC"

=== modified file 'tests/expr.py'
--- tests/expr.py	2009-06-18 15:05:18 +0000
+++ tests/expr.py	2009-07-10 05:20:10 +0000
@@ -1330,6 +1330,19 @@
         self.assertEquals(statement, "EXISTS func1()")
         self.assertEquals(state.parameters, [])
 
+    def test_neg(self):
+        expr = Neg(Func1())
+        state = State()
+        statement = compile(expr, state)
+        self.assertEquals(statement, "- func1()")
+        self.assertEquals(state.parameters, [])
+
+        expr = -Func1()
+        state = State()
+        statement = compile(expr, state)
+        self.assertEquals(statement, "- func1()")
+        self.assertEquals(state.parameters, [])
+
     def test_asc(self):
         expr = Asc(Func1())
         state = State()
@@ -2107,6 +2120,11 @@
         py_expr = compile_python(expr)
         self.assertEquals(py_expr, "elem1+elem2+elem3+elem4")
 
+    def test_neg(self):
+        expr = Neg(elem1)
+        py_expr = compile_python(expr)
+        self.assertEquals(py_expr, "-elem1")
+
     def test_sub(self):
         expr = Sub(elem1, Sub(elem2, elem3))
         py_expr = compile_python(expr)