Changeset 177

Timestamp:

09/25/07 00:40:24

Author:

fumanchu

Message:

New test and fix for adding Expressions with LOAD_GLOBAL instructions.

Files:

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

trunk/geniusql/logic.py

@@ -229 +229 @@
-    
-    def visit_LOAD_ATTR(self, lo, hi):
+        src = self.instr_index[self.cursor]
+        if src:
+            value = src.co_names[lo + (hi << 8)]
+            newindex = self.name_index(value)
+            self.newcode[-2:] = [newindex & 0xFF, newindex >> 8]
+    
+    def visit_LOAD_GLOBAL(self, lo, hi):
-        src = self.instr_index[self.cursor]
-        if src:

trunk/geniusql/test/test_logic.py

@@ -100 +100 @@
-            'and ((x.DateTo == None) or (x.DateTo >= datetime.date(2005, 11, 17)))) '
-            'and ((x.DirectoryID == None) or (x.DirectoryID == 0))')
+        
+        base_expr = logic.Expression(lambda x: x.BirthDate != None)
+        stnd_expr = logic.Expression(lambda x: month(x.BirthDate) == 3 and
+                                     day(x.BirthDate) == 12)
+        combo = base_expr + stnd_expr
+        self.assertEqual(map(ord, combo.func.func_code.co_code),
+                         nums(['LOAD_FAST', 0, 0,
+                               'LOAD_ATTR', 1, 0,
+                               'LOAD_CONST', 0, 0,
+                               'COMPARE_OP', 3, 0,
+                               'JUMP_IF_FALSE', 41, 0,
+                               'POP_TOP',
+                               'LOAD_GLOBAL', 3, 0,
+                               'LOAD_FAST', 0, 0,
+                               'LOAD_ATTR', 1, 0,
+                               'CALL_FUNCTION', 1, 0,
+                               'LOAD_CONST', 1, 0,
+                               'COMPARE_OP', 2, 0,
+                               'JUMP_IF_FALSE', 19, 0,
+                               'POP_TOP',
+                               'LOAD_GLOBAL', 4, 0,
+                               'LOAD_FAST', 0, 0,
+                               'LOAD_ATTR', 1, 0,
+                               'CALL_FUNCTION', 1, 0,
+                               'LOAD_CONST', 2, 0,
+                               'COMPARE_OP', 2, 0,
+                               'RETURN_VALUE']))
-    
-    def test_Aggregator(self):