Changeset 191

Timestamp:

01/01/07 23:41:10 (2 years ago)

Author:

akhavr

Message:

ticket:371:

• completed, ctest passes
  

Files:

• pybeast/trunk/ctest/py2py.py (modified) (1 diff)
• pybeast/trunk/dtest/py2py.py (modified) (5 diffs)
• pybeast/trunk/src/py2py.py (modified) (4 diffs)

pybeast/trunk/ctest/py2py.py

@@ -27 +27 @@
-        original = open('.temp.original','w')
-        print >> original, src
-
+()
-        formatted = open('.temp.formatted','w')
-        print >> formatted, formatter.dump()
-        formatted.close()
-        os.system('diff -uw .temp.original .temp.formatted')
-
-msg = 'Failed to reformat \n%s\n correctly.\n AST: %s\nResult: \n%s'
-formatter.dump()==src
-msg % (src, ast, formatter.dump()
+
+ast2 = compiler.parse(formatter.dump())
+repr(ast)==repr(ast2)
+'AST differ, original:\n%s\nNew:\n%s' % (ast, ast2
-
-    def test_complete(self):

pybeast/trunk/dtest/py2py.py

@@ -96 +96 @@
-                        'Tried to put parens as in if(op_stack[-2]) in list')
-
+    def test_and_the_or(self):
+        'Test parens around and to an or'
+        self.failUnless(Styler().need_parens(['And', 'Or']),
+                        'Failed to put parens around (a or b) and c')
+
-
-class NeedNewline(unittest.TestCase):
@@ -137 +142 @@
-        self.failUnless(formatter.dump()==expr,
-                        msg % (expr, ast, formatter.dump()))
+        ast2 = compiler.parse(formatter.dump())
+        self.failUnless(repr(ast) == repr(ast2),
+                        'AST differ, original:\n%s\nNew:\n%s' % (ast, ast2))
-
-
@@ -217 +225 @@
-        'Test FloorDiv expr'
-        self.reformat_and_test('a // 5')
+
+    def test_parens(self):
+        'Test parens'
+        self.reformat_and_test('(a or b) and c')
-
-
@@ -564 +576 @@
-
-    def test_parens(self):
-len(x) > 1 or n.c.n != y
-
-
+( len(x) > 1 or n.c.n != y )
+(
+)
-                               +'and len(node.nodes):\n    pass\n\n')
-
@@ -745 +757 @@
-
-
+class Global(Expr):
+    'Test \'global\' handling'
+
+    def test_global(self):
+        'global x'
+        self.reformat_and_test('global x, y')
+
+
+class Exec(Expr):
+    'Test exec'
+
+    def test_simple(self):
+        'exec x + y'
+        self.reformat_and_test('exec x + y')
+
+    def test_locals(self):
+        'exec with locals'
+        self.reformat_and_test('exec x + y in y')
+
+    def test_globals(self):
+        'exec with locals and globals'
+        self.reformat_and_test('exec x + y in y, x')
+
+
-if __name__ == '__main__':
-    unittest.main()

pybeast/trunk/src/py2py.py

@@ -28 +28 @@
-        inside_op = op_stack[-1]
-        if inside_op in ('Add', 'Sub') and outside_op in ('Mul', 'Div'):
+            return True
+        if inside_op == 'Or' and outside_op == 'And':
-            return True
-        if outside_op == 'Compare' and inside_op not in (
@@ -130 +132 @@
-    def visit_generic_list(self, node, walker, code):
-        'visit list join node'
-
+
+
+
+
+
+
-            walker.dispatch(subnode)
-            self.code += ' %s' % code
-            continue
+        
-        self.code = self.code[:-len(' %s' %code)]
+        if need_parens_now:
+            self.code += ')'
-
-    def visit_function_paramlist(self, node, walker):
@@ -343 +353 @@
-        self.code += '}'
-
+    def visit_exec(self, node, walker):
+        'visit Exec node'
+        self.code += 'exec'
+        walker.dispatch(node.expr)
+        if not node.locals:
+            return
+        self.code += ' in'
+        walker.dispatch(node.locals)
+        if not node.globals:
+            return
+        self.code += ','
+        walker.dispatch(node.globals)
+
-    def visit_for(self, node, walker):
-        'visit For statement node'
@@ -403 +426 @@
-            for ifs in node.ifs:
-                walker.dispatch(ifs)
+
+    def visit_global(self, node, walker):
+        'visit Global node'
+        self.code += 'global'
+        for name in node.names:
+            self.code += ' %s,' % name
+        self.code = self.code[:-1]
-
-    def visit_if(self, node, walker):