Changeset 171

Timestamp:

02/26/06 04:02:17

Author:

fumanchu

Message:

Added codewalk support for dict creation (BUILD_MAP, DUP_TOP, ROT_THREE, and STORE_SUBSCR).

Files:

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

trunk/codewalk.py

@@ -687 +687 @@
-
-
+class MapStackObject(dict):
+    
+    def __add__(self, other):
+        if isinstance(other, basestring):
+            return repr(self) + other
+        return dict.__add__(self, other)
+    
+    def __repr__(self):
+        return "{%s}" % ", ".join([": ".join((k, v))
+                                   for k, v in self.iteritems()])
+
+
-class LambdaDecompiler(Visitor):
-    """LambdaDecompiler(obj=lambda function or func_code).
@@ -773 +785 @@
-                self.debug("newtarget:", self.last_target_ip, target)
-    
+    def visit_BUILD_LIST(self, lo, hi):
+        terms = ", ".join([self.stack.pop() for i in range(lo + hi << 8)])
+        self.stack.append("[%s]" % terms)
+    
+    def visit_BUILD_MAP(self, lo, hi):
+        # We're actually going to put a non-string object on the stack here,
+        # with the expectation that the next bytecodes will populate it.
+        self.stack.append(MapStackObject())
+    
-    def visit_BUILD_TUPLE(self, lo, hi):
-        terms = ", ".join([self.stack.pop() for i in range(lo + hi << 8)])
-        self.stack.append("(%s)" % terms)
-    
-    def visit_BUILD_LIST(self, lo, hi):
-        terms = ", ".join([self.stack.pop() for i in range(lo + hi << 8)])
-        self.stack.append("[%s]" % terms)
-    
-    def visit_CALL_FUNCTION(self, lo, hi):
@@ -807 +824 @@
-        self.stack.append(term1 + " " + op + " " + term2)
-        self.debug(op)
+    
+    def visit_DUP_TOP(self):
+        self.stack.append(self.stack[-1])
-    
-    def visit_JUMP_IF_FALSE(self, lo, hi):
@@ -855 +875 @@
-        self.stack.pop()
-    
+    def visit_ROT_THREE(self):
+        v = self.stack.pop()
+        k = self.stack.pop()
+        x = self.stack.pop()
+        self.stack.extend([k, x, v])
+    
-    def visit_SLICE_PLUS_0(self):
-        arg = self.stack.pop()
@@ -873 +899 @@
-        del self.stack[-3:]
-        self.stack.append("%s[%s:%s]" % args)
+    
+    def visit_STORE_SUBSCR(self):
+        v = self.stack.pop()
+        x = self.stack.pop()
+        k = self.stack.pop()
+        x[k] = v
-    
-    def visit_UNARY_CONVERT(self):

trunk/test/test_logic.py

@@ -49 +49 @@
-        e = logic.Expression(lambda x: x.Name in ['George', 'John'])
-        self.assertEqual(repr(e), lx + "x.Name in ['George', 'John'])")
+        
+        # Test varying return values.
+        e = logic.Expression(lambda x: x + 1)
+        self.assertEqual(repr(e), lx + "x + 1)")
+        e = logic.Expression(lambda x: x.Val + 3)
+        self.assertEqual(repr(e), lx + "x.Val + 3)")
+        e = logic.Expression(lambda x, y: x ** y)
+        self.assertEqual(repr(e), "logic.Expression(lambda x, y: x ** y)")
+        e = logic.Expression(lambda x: {'a': 1, 'b': 2})
+        self.assertEqual(repr(e), lx + "{'a': 1, 'b': 2})")
+        e = logic.Expression(lambda x: {'a': 1, 'b': 2}[x.Name[0]])
+        self.assertEqual(repr(e), lx + "{'a': 1, 'b': 2}[x.Name[0]])")
-    
-    def test_pickling(self):