# HG changeset patch # User Yuya Nishihara # Date 2015-05-06 01:17:41 # Node ID 060bdfef2517bfa06609293c66e51a2babd2df5e # Parent 3f1a9b44b8c2631dab807cf36fbc03c1f3ecfd52 parser: extract closure of prettyformat() to a top-level function There was no capture until I added 'leafnodes' argument. diff --git a/mercurial/parser.py b/mercurial/parser.py --- a/mercurial/parser.py +++ b/mercurial/parser.py @@ -94,17 +94,17 @@ class parser(object): return self.eval(t) return t +def _prettyformat(tree, leafnodes, level, lines): + if not isinstance(tree, tuple) or tree[0] in leafnodes: + lines.append((level, str(tree))) + else: + lines.append((level, '(%s' % tree[0])) + for s in tree[1:]: + _prettyformat(s, leafnodes, level + 1, lines) + lines[-1:] = [(lines[-1][0], lines[-1][1] + ')')] + def prettyformat(tree, leafnodes): - def _prettyformat(tree, level, lines): - if not isinstance(tree, tuple) or tree[0] in leafnodes: - lines.append((level, str(tree))) - else: - lines.append((level, '(%s' % tree[0])) - for s in tree[1:]: - _prettyformat(s, level + 1, lines) - lines[-1:] = [(lines[-1][0], lines[-1][1] + ')')] - lines = [] - _prettyformat(tree, 0, lines) + _prettyformat(tree, leafnodes, 0, lines) output = '\n'.join((' ' * l + s) for l, s in lines) return output