Changeset 178

Timestamp:

09/25/07 01:30:29

Author:

fumanchu

Message:

New test and fix for adding Expressions with LOAD_DEREF instructions.

Files:

• trunk/geniusql/logic.py (modified) (1 diff)
• trunk/geniusql/test/test_logic.py (modified) (1 diff)

trunk/geniusql/logic.py

@@ -248 +248 @@
-            newindex = self.const_index(value)
-            self.newcode[-2:] = [newindex & 0xFF, newindex >> 8]
+    
+    def visit_LOAD_DEREF(self, lo, hi):
+        src = self.instr_index[self.cursor]
+        if src and hasattr(src, '_func'):
+            # name = self.co_freevars[lo + (hi << 8)]
+            value = src._func.func_closure[lo + (hi << 8)]
+            value = codewalk.deref_cell(value)
+            newindex = self.const_index(value)
+            self.tail(3, 'LOAD_CONST', newindex & 0xFF, newindex >> 8)
-
-

trunk/geniusql/test/test_logic.py

@@ -101 +101 @@
-            'and ((x.DirectoryID == None) or (x.DirectoryID == 0))')
-        
+        birth_month = 3
-        base_expr = logic.Expression(lambda x: x.BirthDate != None)
-3
+birth_month
-                                     day(x.BirthDate) == 12)
-        combo = base_expr + stnd_expr