small changes

This commit is contained in:
rocky
2016-06-06 15:34:57 -04:00
parent cf4fb3c252
commit 8b1250dcc8
4 changed files with 8 additions and 15 deletions

View File

@@ -50,7 +50,9 @@ class PythonParser(GenericASTBuilder):
if nt in collect and len(args) > 1: if nt in collect and len(args) > 1:
# #
# Collect iterated thingies together. # Collect iterated thingies together. That is rather than
# stmts -> stmts stmt -> stmts stmt -> ...
# stmms -> stmt stmt ...
# #
rv = args[0] rv = args[0]
rv.append(args[1]) rv.append(args[1])

View File

@@ -35,7 +35,7 @@ class AST(UserList):
rv = str(self.type) rv = str(self.type)
for k in self: for k in self:
child_text = str(k).replace('\n', '\n ') child_text = str(k).replace('\n', '\n ')
if hasattr(k, '__len__'): if hasattr(k, '__len__') and len(k) > 1:
rv += '\n(%d) %s' % (len(k), child_text) rv += '\n(%d) %s' % (len(k), child_text)
else: else:
rv += '\n' + child_text rv += '\n' + child_text

View File

@@ -732,7 +732,7 @@ class FragmentsWalker(pysource.SourceWalker, object):
self.prune() self.prune()
def gen_source(self, ast, name, customize, isLambda=False, returnNone=False): def gen_source(self, ast, name, customize, isLambda=False, returnNone=False):
"""convert AST to source code""" """convert AST to Python source code"""
rn = self.return_none rn = self.return_none
self.return_none = returnNone self.return_none = returnNone

View File

@@ -590,7 +590,6 @@ class SourceWalker(GenericASTTraversal, object):
def write(self, *data): def write(self, *data):
if (len(data) == 0) or (len(data) == 1 and data[0] == ''): if (len(data) == 0) or (len(data) == 1 and data[0] == ''):
return return
# import pdb; pdb.set_trace()
out = ''.join((str(j) for j in data)) out = ''.join((str(j) for j in data))
n = 0 n = 0
for i in out: for i in out:
@@ -812,10 +811,6 @@ class SourceWalker(GenericASTTraversal, object):
if node[-2][0][-1] != 'BUILD_TUPLE_0': if node[-2][0][-1] != 'BUILD_TUPLE_0':
node[-2][0].type = 'build_tuple2' node[-2][0].type = 'build_tuple2'
self.default(node) self.default(node)
# maybe_tuple = node[-2][-1]
# if maybe_tuple.type.startswith('BUILD_TUPLE'):
# maybe_tuple.type = 'build_tuple2'
# self.default(node)
n_store_subscr = n_binary_subscr = n_delete_subscr n_store_subscr = n_binary_subscr = n_delete_subscr
@@ -988,7 +983,7 @@ class SourceWalker(GenericASTTraversal, object):
self.prune() # stop recursing self.prune() # stop recursing
def n_list_compr(self, node): def n_list_compr(self, node):
"""List comprehensions the way they are done in Python2. """List comprehensions the way they are done in Python 2.
""" """
p = self.prec p = self.prec
self.prec = 27 self.prec = 27
@@ -1322,10 +1317,7 @@ class SourceWalker(GenericASTTraversal, object):
l = list(kv_node) l = list(kv_node)
i = 0 i = 0
while i < len(l): while i < len(l):
try: name = self.traverse(l[i+1], indent='')
name = self.traverse(l[i+1], indent='')
except:
from trepan.api import debug; debug()
value = self.traverse(l[i], indent=self.indent+(len(name)+2)*' ') value = self.traverse(l[i], indent=self.indent+(len(name)+2)*' ')
self.write(sep, name, ': ', value) self.write(sep, name, ': ', value)
sep = line_seperator sep = line_seperator
@@ -1504,7 +1496,6 @@ class SourceWalker(GenericASTTraversal, object):
elif typ == 'C': elif typ == 'C':
low, high, sep = entry[arg] low, high, sep = entry[arg]
remaining = len(node[low:high]) remaining = len(node[low:high])
# remaining = len(node[low:high])
for subnode in node[low:high]: for subnode in node[low:high]:
self.preorder(subnode) self.preorder(subnode)
remaining -= 1 remaining -= 1
@@ -1821,7 +1812,7 @@ class SourceWalker(GenericASTTraversal, object):
self.classes.pop(-1) self.classes.pop(-1)
def gen_source(self, ast, name, customize, isLambda=False, returnNone=False): def gen_source(self, ast, name, customize, isLambda=False, returnNone=False):
"""convert AST to source code""" """convert AST to Python source code"""
rn = self.return_none rn = self.return_none
self.return_none = returnNone self.return_none = returnNone