Changeset 92

Timestamp:

11/16/05 03:32:07

Author:

fumanchu

Message:

An ugly first fix for #25 (Python 2.4's JUMP changes). Could be inlined, but needs some improvement regardless. Probably needs more tests too.

Files:

• trunk/codewalk.py (modified) (9 diffs)
• trunk/test_logic.py (modified) (3 diffs)

trunk/codewalk.py

@@ -120 +120 @@
-    
-    def __init__(self, obj):
+        self.verbose = False
+        
-        # Distill supplied 'obj' arg to a code block string.
-        if isinstance(obj, FunctionType):
@@ -135 +137 @@
-        
-        self._bytecode = obj
+    
+    def debug(self, *messages):
+        if self.verbose:
+            for term in messages:
+                print term,
+        else:
+            pass
-    
-    def walk(self):
@@ -243 +252 @@
-    
-    def __init__(self, obj):
+        self.verbose = False
+        
-        if isinstance(obj, FunctionType):
-            self._func = obj
@@ -387 +398 @@
-            pos = self.const_index(value)
-            self.tail(3, 'LOAD_CONST', pos & 0xFF, pos >> 8)
-
-
+
-
-
@@ -678 +688 @@
-    
-    def __init__(self, obj):
+        self.verbose = False
+        
-        # Distill supplied 'obj' arg to a code block string.
-        if isinstance(obj, FunctionType):
@@ -723 +735 @@
-        self.newcode = []
-        
-# Add a list of 'and' and 'or' mappings {target: [(previous TOS, and/or)...]
+self.jump_values = {
-        self.targets = {}
-        b = self._bytecode
+        self.debug("\nWALKING: ", b)
-        while self.cursor < len(b):
-
-
+
+
+
+
+
+
+
+
-            op = b[self.cursor]
-            self.cursor += 1
@@ -740 +759 @@
-                args = ()
-            
+            self.debug("visit (%s, %s)" % (op, repr(args)))
-            self.visit_instruction(op, *args)
-            
-            name = 'visit_' + opname[op]
-            name = name.replace('+', '_PLUS_')
-            
-            if hasattr(self, name):
+                self.debug("=> %s(%s)" % (name, repr(args)))
-                getattr(self, name)(*args)
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    def visit_BUILD_TUPLE(self, lo, hi):
@@ -789 +834 @@
-    
-    def visit_JUMP_IF_FALSE(self, lo, hi):
+        # Note that self.cursor has already advanced to the next instruction.
+        ip = self.cursor - 3
+        self.jump_values[ip] = self.stack[-1]
+        
-        target = self.cursor + (lo + (hi << 8))
-targetstack
-targetstack.append((self.stack.pop()
+bucket
+bucket.append((ip
-    
-    def visit_JUMP_IF_TRUE(self, lo, hi):
+        # Note that self.cursor has already advanced to the next instruction.
+        ip = self.cursor - 3
+        self.jump_values[ip] = self.stack[-1]
+        
-        target = self.cursor + (lo + (hi << 8))
-targetstack
-targetstack.append((self.stack.pop()
+bucket
+bucket.append((ip
-    
-    def visit_LOAD_ATTR(self, lo, hi):
@@ -819 +872 @@
-        self.stack.append(self.co_names[lo + (hi << 8)])
-    
+    def visit_POP_TOP(self):
+        self.stack.pop()
+    
+    def visit_RETURN_VALUE(self):
+        # Note that self.cursor is already the next instruction.
+        ip = self.cursor - 1
+        self.jump_values[ip] = self.stack[-1]
+    
-    def visit_SLICE_PLUS_0(self):
-        arg = self.stack.pop()

trunk/test_logic.py

@@ -59 +59 @@
-                         "lambda x: (x.TripStatus != 'Inquiry') and ((x.Field "
-                         "== 'BC') and (x.StartDate >= 3))")
-
+    
-        # Test Expression pickling
-        e = logic.Expression(lambda x: x.LastDate > datetime.date(2004, 3, 1))
@@ -70 +70 @@
-        f = pickle.loads(p)
-        self.assertEqual(repr(e), repr(f))
-
-    
-    def test_Expression_addition(self):
@@ -78 +77 @@
-        e += logic.Expression(b)
-        self.assertEqual(e.code(), "lambda x: (x.Date == 3) and (x.Qty == 5)")
+        
+        # This failed in endue.price_filter on 11/14/2005
+        f = logic.Expression(lambda x: ((x.DateFrom == None or x.DateFrom <= datetime.date(2005, 11, 17))
+                                        and (x.DateTo == None or x.DateTo >= datetime.date(2005, 11, 17))))
+        f += logic.Expression(lambda x: x.DirectoryID == None or x.DirectoryID == 0)
+        self.assertEqual(f.code(),
+            'lambda x: (((x.DateFrom == None) or (x.DateFrom <= datetime.date(2005, 11, 17))) '
+            'and ((x.DateTo == None) or (x.DateTo >= datetime.date(2005, 11, 17)))) '
+            'and ((x.DirectoryID == None) or (x.DirectoryID == 0))')
-    
-    def test_Aggregator(self):