Changeset 189

Timestamp:

12/31/06 15:46:50 (2 years ago)

Author:

akhavr

Message:

ticket:371:

• implemented FunctionDef?, ClassDef?, AssAttr? and, partly, If
  

Files:

• pybeast/trunk/dtest/py2py.py (modified) (3 diffs)
• pybeast/trunk/src/py2py.py (modified) (11 diffs)

pybeast/trunk/dtest/py2py.py

@@ -45 +45 @@
-        self.failUnless(Styler().need_space(stack, 'a = 1 and'),
-                        'Failed to put a space after boolean op sign')
+
+    def test_function_def_param(self):
+        'Test for no space after = in function defaults'
+        stack = ['Stmt', 'Function', 'Const']
+        self.failUnless(not Styler().need_space(stack, 'def x(a, b='),
+                        'Trying to put a space after = in function default')
-        
-
@@ -54 +60 @@
-        self.failUnless(Styler().need_parens(['Mul', 'Add']),
-                        'Failed to put parens around (a + b) * c')
+
+    def test_no_parens_in_if(self):
+        'Test no parens in if len(list) < 2:'
+        self.failUnless(not Styler().need_parens(['Module', 'Stmt', 'If',
+                                                  'Compare', 'CallFunc']),
+                        'Tried to put parens as in if(len(op_stack)) < 2:')
-
-
@@ -417 +429 @@
-        'from xyz import abc as a'
-        self.reformat_and_test('from unittest import TestCase as tc')
+
+
+class FunctionDef(Expr):
+    'Test how we reformat function definitions'
+
+    def test_simple(self):
+        'simple function'
+        self.reformat_and_test('def x(a):\n    return 0\n    \n')
+
+    def test_with_defaults(self):
+        'function with defaults'
+        self.reformat_and_test('def x(a, b=1):\n    return a + b\n    \n')
+
+
+    def test_with_docstring(self):
+        'function with docstring'
+        self.reformat_and_test('def x(a):\n    \'This is docstring\'\n'
+                               +'    return a * a\n    \n')
+
+    def test_with_decorators(self):
+        'function with decorators'
+        self.reformat_and_test('''\
+@dec2
+@dec1(param)
+def fun(a):
+    \'DocString\'
+    return a * a
+    
+'''
+                               )
+
+
+class ClassDef(Expr):
+    'Test how we handle class definitions'
+
+    def test_simple(self):
+        'test simple class'
+        self.reformat_and_test('\nclass X:\n    \n    pass\n    \n')
+
+    def test_derived_with_docstring(self):
+        'test derived class with docstring'
+        self.reformat_and_test('\nclass Y(X, Z):\n    \'docstring\'\n    \n'
+                               + '    pass\n    \n')
+
+
+class ClassAndConstructor(Expr):
+    'Test constructor assignments'
+
+    def test_styler(self):
+        'test src.py2py.Styler constructor'
+        self.reformat_and_test('''
+class Styler:
+    \'Sets the parens and space style\'
+    
+    def __init__(self):
+        self.space_after_parens = 1
+        self.offset = 0
-        
+    
+''')
+
+class If(Expr):
+    'Test If statement handling'
+
+    def test_simple(self):
+        'test simple if'
+        self.reformat_and_test('if len(op_stack) < 2:\n    return False\n'
+                               +'    \n')
+
-    
-if __name__ == '__main__':

pybeast/trunk/src/py2py.py

@@ -19 +19 @@
-    def __init__(self):
-        self.space_after_parens = 1
-space_around_callfunc
+offset
-    
-    def need_parens(self, op_stack):
@@ -30 +30 @@
-        if inside_op in ('Add', 'Sub') and outside_op in ('Mul', 'Div'):
-            return True
-
+
+
-            return True
-        return False
@@ -43 +44 @@
-        
-        if op_stack[-2] in ('Invert', 'Lambda', 'UnaryAdd', 'UnarySub',
-
+ 'Function'
-            return False
-
@@ -78 +79 @@
-        num_spaces = len(code) - code.rfind('\n')
-        return ' '*num_spaces
+
+    def get_newline(self):
+        'Returns newline and offset to the next non-space symbol'
+        return '\n' + ' '*self.offset
+
+    def add_offset(self):
+        'Creates block'
+        self.offset += 4
+
+    def sub_offset(self):
+        'Closes block'
+        self.offset -= 4
-
-
@@ -115 +128 @@
-        self.code = self.code[:-len(' %s' %code)]
-
+    def visit_function_paramlist(self, node, walker):
+        'visit function parameter list'
+        len_defaults = len(node.argnames)
+        have_varargs = node.flags & compiler.consts.CO_VARARGS
+        have_varkeywords = node.flags & compiler.consts.CO_VARKEYWORDS
+
+        if have_varargs:
+            len_defaults -= 1
+        if have_varkeywords:
+            len_defaults -= 1
+        defaults = [None] * len_defaults
+        defaults[:len(node.defaults)] = node.defaults
+        defaults.reverse()
+
+        prefix = ''
+        for i in range( len(node.argnames) ):
+            arg = node.argnames[i]
+            try:
+                default = defaults[i]
+            except IndexError:
+                default = None
+                if prefix == '' and have_varargs:
+                    prefix = '*'
+                else:
+                    prefix = '**'
+            if self.style.need_space(self.expr_ops_stack, self.code):
+                self.code += ' '
+            self.code += '%s%s' % (prefix, arg)
+            if default is None:
+                self.code += ','
+            else:
+                self.code += '='
+                walker.dispatch(default)
+                self.code += ','
+        
-    def visit_sequence(self, node, walker, braket):
-        'visit List node'
@@ -132 +180 @@
-        self.code += code
-        walker.dispatch(node.expr)
+
+    # only specific nodes below
+
+    def visit_assattr(self, node, walker):
+        'visit AssAttr node'
+        if self.style.need_space(self.expr_ops_stack, self.code):
+            self.code += ' '
+        walker.dispatch(node.expr)
+        self.code += '.'+node.attrname
+        if node.flags == 'OP_ASSIGN':
+            self.code += ' ='
+        
-        
-    def visit_assname(self, node, *args):
@@ -180 +240 @@
-
-        self.code += ')'
+
+    def visit_class(self, node, walker):
+        'visit Class node'
+        self.code += self.style.get_newline()
+        self.code += 'class '
+        self.code += node.name
+        if node.bases:
+            self.code += '('
+            for base in node.bases:
+                walker.dispatch(base)
+                self.code += ','
+            self.code = self.code[:-1] + ')'
+                    
+        self.code += ':'
+        self.style.add_offset()
+        self.code += self.style.get_newline()
+
+        if node.doc:
+            self.code += repr(node.doc)
+            self.code += self.style.get_newline()
+        self.code += self.style.get_newline()
+        walker.dispatch(node.code)
+        self.style.sub_offset()
-
-    def visit_compare(self, node, walker):
@@ -219 +302 @@
-        self.code += '}'
-
+    def visit_from(self, node, walker):
+        'visit From node (from xyz import abc)'
+        self.code += 'from %s import' % node.modname
+        for name in node.names:
+            self.code += ' %s' % name[0]
+            if name[1]:
+                self.code += ' as %s' % name[1]
+            self.code += ','
+        self.code = self.code[:-1]
+
+    def visit_function(self, node, walker):
+        'visit Function node'
+        if node.decorators:
+            for decorator in node.decorators:
+                self.code += '@'
+                walker.dispatch(decorator)
+                self.code += self.style.get_newline()
+        
+        self.code += 'def %s(' % node.name
+
+        self.visit_function_paramlist(node, walker)                
+        self.code = self.code[:-1] + '):'
+        
+        self.style.add_offset()
+        self.code += self.style.get_newline()
+
+        if node.doc:
+            self.code += "'%s'" % node.doc
+            self.code += self.style.get_newline()
+
+        walker.dispatch(node.code)
+        self.style.sub_offset()
+
-    def visit_getattr(self, node, walker):
-        'visit Getattr node'
@@ -237 +353 @@
-                walker.dispatch(ifs)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    def visit_import(self, node, walker):
@@ -264 +381 @@
-    def visit_lambda(self, node, walker):
-        'visit Lambda node'
-        len_defaults = len(node.argnames)
-        have_varargs = node.flags & compiler.consts.CO_VARARGS
-        have_varkeywords = node.flags & compiler.consts.CO_VARKEYWORDS
-
-        if have_varargs:
-            len_defaults -= 1
-        if have_varkeywords:
-            len_defaults -= 1
-        defaults = [None] * len_defaults
-        defaults[:len(node.defaults)] = node.defaults
-        defaults.reverse()
-
-        if self.style.need_space(self.expr_ops_stack, self.code):
-            self.code += ' '
-        self.code += 'lambda'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-        self.code = self.code[:-1] + ':'
-        walker.dispatch(node.code)
@@ -328 +414 @@
-        self.code += str(node.name)
-
+    def visit_pass(self, node, walker):
+        'visit Pass node'
+        self.code += 'pass'
+
+    def visit_return(self, node, walker):
+        'visit Return node'
+        self.code += 'return'
+        walker.dispatch(node.value)
+
-    def visit_stmt(self, node, walker):
-        'visit Stmt node'
-        for stmt_node in node.nodes:
-            walker.dispatch(stmt_node)
-'\n'
+self.style.get_newline()
-
-    def visit_subscript(self, node, walker):