Changeset 58

Timestamp:

04/05/07 11:23:46

Author:

fumanchu

Message:

Fixes for codewalk.MapStackObject?.

Files:

• trunk/geniusql/codewalk.py (modified) (5 diffs)
• trunk/geniusql/test/test_codewalk.py (modified) (1 diff)

trunk/geniusql/codewalk.py

@@ -700 +700 @@
-    
-    def __repr__(self):
-
-
+
+
+
+
-
-
@@ -777 +779 @@
-    
-    def visit_BUILD_LIST(self, lo, hi):
-elf.stack.pop(
+tr(self.stack.pop()
-        terms.reverse()
-        self.stack.append("[%s]" % ", ".join(terms))
@@ -787 +789 @@
-    
-    def visit_BUILD_TUPLE(self, lo, hi):
-elf.stack.pop(
+tr(self.stack.pop()
-        terms.reverse()
-        self.stack.append("(%s)" % ", ".join(terms))
@@ -797 +799 @@
-            key = self.stack.pop()
-            kwargs[key] = val
-k + "=" + v
+"%s=%s" % (k, v)
-        
-        args = []
@@ -804 +806 @@
-            args.append(arg)
-        args.reverse()
-args
+[str(x) for x in args]
-        
-        if kwargs:

trunk/geniusql/test/test_codewalk.py

@@ -220 +220 @@
-        self.assertEqual(codewalk.LambdaDecompiler(builder).code(),
-                         "lambda a, b, c: (c, [b.next(), a], c.ID)")
+        
+        # Test MapStackObject
+        e = lambda t: {'x': 3, 'y': 5}
+        ld = codewalk.LambdaDecompiler(e)
+        c = ld.code()
+        self.assertEqual(c, "lambda t: {'y': 5, 'x': 3}", (c, ld.stack))
+        
+        e = lambda t:{'x':{'a':10}, 'y':5}
+        ld = codewalk.LambdaDecompiler(e)
+        c = ld.code()
+        self.assertEqual(c, "lambda t: {'y': 5, 'x': {'a': 10}}", (c, ld.stack))
+        
+        e = lambda t:{'x':str({'a':10}), 'y':5}
+        ld = codewalk.LambdaDecompiler(e)
+        c = ld.code()
+        self.assertEqual(c, "lambda t: {'y': 5, 'x': str({'a': 10})}", (c, ld.stack))
+        
+        e = lambda t: [{'x': 10}, {'y': 5}]
+        ld = codewalk.LambdaDecompiler(e)
+        c = ld.code()
+        self.assertEqual(c, "lambda t: [{'x': 10}, {'y': 5}]", (c, ld.stack))
-    
-    def test_BranchTracker(self):