mercurial-scm/hg: mercurial/parser.py comparison

comparison mercurial/parser.py @ 34073:7bbc4e113e5f

parser: stabilize output of prettyformat() by using byte-safe repr() The format of leaf nodes is slightly changed so they look more similar to internal nodes.

author	Yuya Nishihara <yuya@tcha.org>
date	Sun, 03 Sep 2017 21:17:25 +0900
parents	79681d8ee587
children	0fa781320203

comparison

equal deleted inserted replaced

-:30535fe47e78
+:7bbc4e113e5f
 from __future__ import absolute_import
 from .i18n import _
 from . import (
+encoding,
 error,
 util,
 )
 class parser(object):
 return util.unescapestr(s)
 except ValueError as e:
 # mangle Python's exception into our format
 raise error.ParseError(str(e).lower())
+def _brepr(obj):
+if isinstance(obj, bytes):
+return b"'%s'" % util.escapestr(obj)
+return encoding.strtolocal(repr(obj))
 def _prettyformat(tree, leafnodes, level, lines):
-if not isinstance(tree, tuple) or tree[0] in leafnodes:
+if not isinstance(tree, tuple):
-lines.append((level, str(tree)))
+lines.append((level, _brepr(tree)))
+elif tree[0] in leafnodes:
+rs = map(_brepr, tree[1:])
+lines.append((level, '(%s %s)' % (tree[0], ' '.join(rs))))
 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] + ')')]
 ...     ('or',
 ...       ('symbol', '1'),
 ...       ('symbol', '2')),
 ...     ('symbol', '3')))
 (or
-('symbol', '1')
+(symbol '1')
-('symbol', '2')
+(symbol '2')
-('symbol', '3'))
+(symbol '3'))
 >>> f(('func',
 ...     ('symbol', 'p1'),
 ...     ('or',
 ...       ('or',
 ...         ('func',
 ...                 ('symbol', '5'),
 ...                 ('symbol', '6')),
 ...               ('symbol', '7'))))),
 ...       ('symbol', '8'))))
 (func
-('symbol', 'p1')
+(symbol 'p1')
 (or
 (func
-('symbol', 'sort')
+(symbol 'sort')
 (list
 (or
-('symbol', '1')
+(symbol '1')
-('symbol', '2')
+(symbol '2')
-('symbol', '3'))
+(symbol '3'))
 (negate
-('symbol', 'rev'))))
+(symbol 'rev'))))
 (and
-('symbol', '4')
+(symbol '4')
 (group
 (or
-('symbol', '5')
+(symbol '5')
-('symbol', '6')
+(symbol '6')
-('symbol', '7'))))
+(symbol '7'))))
-('symbol', '8')))
+(symbol '8')))
 """
 if not isinstance(tree, tuple):
 return tree
 op = tree[0]
 if op not in targetnodes:
 >>> def pprint(tree):
 ...     print prettyformat(tree, ('_aliasarg', 'string', 'symbol'))
 >>> args = ['$1', '$2', 'foo']
 >>> pprint(builddefn('$1 or foo', args))
 (or
-('_aliasarg', '$1')
+(_aliasarg '$1')
-('_aliasarg', 'foo'))
+(_aliasarg 'foo'))
 >>> try:
 ...     builddefn('$1 or $bar', args)
 ... except error.ParseError as inst:
 ...     print parseerrordetail(inst)
 invalid symbol '$bar'
 >>> args = ['$1', '$10', 'foo']
 >>> pprint(builddefn('$10 or baz', args))
 (or
-('_aliasarg', '$10')
+(_aliasarg '$10')
-('symbol', 'baz'))
+(symbol 'baz'))
 >>> pprint(builddefn('"$1" or "foo"', args))
 (or
-('string', '$1')
+(string '$1')
-('string', 'foo'))
+(string 'foo'))
 """
 tree = cls._parse(defn)
 if args:
 args = set(args)
 else:

Mercurial > public > mercurial-scm > hg

comparison mercurial/parser.py @ 34073:7bbc4e113e5f