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

comparison mercurial/parser.py @ 28910:1203159c8928

parser: factor out _trygetfunc() that extracts function name and arguments This provides a customization point for templater. In templater, there are two ways to call a unary function: func(x) and x|func. They are processed differently in templater due to historical reasons, but they should be handled in the same way while expanding aliases. In short, x|func should be processed as syntactic sugar for func(x). _funcnode and _getlist() are replaced by _trygetfunc().

author	Yuya Nishihara <yuya@tcha.org>
date	Tue, 29 Mar 2016 17:27:34 +0900
parents	edbffdc7f6a0
children	dbed4c4f48ae

comparison

equal deleted inserted replaced

-:edbffdc7f6a0
+:1203159c8928
 h = heads(default)
 b($1) = ancestors($1) - ancestors(default)
 """
 # typically a config section, which will be included in error messages
 _section = None
-# tags of symbol and function nodes
+# tag of symbol node
 _symbolnode = 'symbol'
-_funcnode = 'func'
 def __new__(cls):
 raise TypeError("'%s' is not instantiatable" % cls.__name__)
 @staticmethod
 def _parse(spec):
 """Parse an alias name, arguments and definition"""
 raise NotImplementedError
 @staticmethod
-def _getlist(tree):
+def _trygetfunc(tree):
-"""Extract a list of arguments from parsed tree"""
+"""Return (name, args) if tree is a function; otherwise None"""
 raise NotImplementedError
 @classmethod
 def _builddecl(cls, decl):
 """Parse an alias declaration into ``(name, args, errorstr)``
 >>> def parse(expr):
 ...     x = parsemap[expr]
 ...     if isinstance(x, Exception):
 ...         raise x
 ...     return x
->>> def getlist(tree):
+>>> def trygetfunc(tree):
-...     if not tree:
+...     if not tree or tree[0] != 'func' or tree[1][0] != 'symbol':
-...         return []
+...         return None
-...     if tree[0] == 'list':
+...     if not tree[2]:
-...         return list(tree[1:])
+...         return tree[1][1], []
-...     return [tree]
+...     if tree[2][0] == 'list':
+...         return tree[1][1], list(tree[2][1:])
+...     return tree[1][1], [tree[2]]
 >>> class aliasrules(basealiasrules):
 ...     _parse = staticmethod(parse)
-...     _getlist = staticmethod(getlist)
+...     _trygetfunc = staticmethod(trygetfunc)
 >>> builddecl = aliasrules._builddecl
 >>> builddecl('foo')
 ('foo', None, None)
 >>> builddecl('$foo')
 ('$foo', None, "'$' not for alias arguments")
 name = tree[1]
 if name.startswith('$'):
 return (decl, None, _("'$' not for alias arguments"))
 return (name, None, None)
-if tree[0] == cls._funcnode and tree[1][0] == cls._symbolnode:
+func = cls._trygetfunc(tree)
+if func:
 # "name(arg, ....) = ...." style
-name = tree[1][1]
+name, args = func
 if name.startswith('$'):
 return (decl, None, _("'$' not for alias arguments"))
-args = []
+if any(t[0] != cls._symbolnode for t in args):
-for arg in cls._getlist(tree[2]):
+return (decl, None, _("invalid argument list"))
-if arg[0] != cls._symbolnode:
-return (decl, None, _("invalid argument list"))
-args.append(arg[1])
 if len(args) != len(set(args)):
 return (name, None, _("argument names collide with each other"))
-return (name, args, None)
+return (name, [t[1] for t in args], None)
 return (decl, None, _("invalid format"))
 @classmethod
 def _relabelargs(cls, tree, args):
 ...     '$10 or baz': ('or', ('symbol', '$10'), ('symbol', 'baz')),
 ...     '"$1" or "foo"': ('or', ('string', '$1'), ('string', 'foo')),
 ... }
 >>> class aliasrules(basealiasrules):
 ...     _parse = staticmethod(parsemap.__getitem__)
-...     _getlist = staticmethod(lambda x: [])
+...     _trygetfunc = staticmethod(lambda x: None)
 >>> builddefn = aliasrules._builddefn
 >>> def pprint(tree):
 ...     print prettyformat(tree, ('_aliasarg', 'string', 'symbol'))
 >>> args = ['$1', '$2', 'foo']
 >>> pprint(builddefn('$1 or foo', args))
 if tree[0] == cls._symbolnode:
 name = tree[1]
 a = aliases.get(name)
 if a and a.args is None:
 return a, None
-if tree[0] == cls._funcnode and tree[1][0] == cls._symbolnode:
+func = cls._trygetfunc(tree)
-name = tree[1][1]
+if func:
+name, args = func
 a = aliases.get(name)
 if a and a.args is not None:
-return a, cls._getlist(tree[2])
+return a, args
 return None
 @classmethod
 def _expandargs(cls, tree, args):
 """Replace _aliasarg instances with the substitution value of the

Mercurial > public > mercurial-scm > hg

comparison mercurial/parser.py @ 28910:1203159c8928