[PATCH 5 of 7 V2] parser: move alias definition parser to common rule-set class
Yuya Nishihara
yuya at tcha.org
Sat Apr 2 04:30:20 EDT 2016
# HG changeset patch
# User Yuya Nishihara <yuya at tcha.org>
# Date 1456737007 -32400
# Mon Feb 29 18:10:07 2016 +0900
# Node ID e3157edf28c3a6520c592e704259d388cca52d46
# Parent 80cdd9af74b7da045d2eed7236dedbb8cad66fee
parser: move alias definition parser to common rule-set class
The original _parsealiasdefn() function is split into common _builddefn()
and revset-specific _parsealiasdefn(). revset._relabelaliasargs() is removed
as it is no longer used.
The doctests are ported by using the dummy parse().
diff --git a/mercurial/parser.py b/mercurial/parser.py
--- a/mercurial/parser.py
+++ b/mercurial/parser.py
@@ -371,3 +371,49 @@ class aliasrules(object):
elif sym.startswith('$'):
raise error.ParseError(_("'$' not for alias arguments"))
return (op, sym)
+
+ def _builddefn(self, defn, args):
+ """Parse an alias definition into a tree and marks substitutions
+
+ This function marks alias argument references as ``_aliasarg``. The
+ parsing rule is provided by ``_parsedefn()``.
+
+ ``args`` is a list of alias argument names, or None if the alias
+ is declared as a symbol.
+
+ >>> parsemap = {
+ ... '$1 or foo': ('or', ('symbol', '$1'), ('symbol', 'foo')),
+ ... '$1 or $bar': ('or', ('symbol', '$1'), ('symbol', '$bar')),
+ ... '$10 or baz': ('or', ('symbol', '$10'), ('symbol', 'baz')),
+ ... '"$1" or "foo"': ('or', ('string', '$1'), ('string', 'foo')),
+ ... }
+ >>> parse = parsemap.__getitem__
+ >>> builddefn = aliasrules('', parse, parse, lambda x: [])._builddefn
+ >>> def pprint(tree):
+ ... print prettyformat(tree, ('_aliasarg', 'string', 'symbol'))
+ >>> args = ['$1', '$2', 'foo']
+ >>> pprint(builddefn('$1 or foo', args))
+ (or
+ ('_aliasarg', '$1')
+ ('_aliasarg', 'foo'))
+ >>> try:
+ ... builddefn('$1 or $bar', args)
+ ... except error.ParseError as inst:
+ ... print parseerrordetail(inst)
+ '$' not for alias arguments
+ >>> args = ['$1', '$10', 'foo']
+ >>> pprint(builddefn('$10 or baz', args))
+ (or
+ ('_aliasarg', '$10')
+ ('symbol', 'baz'))
+ >>> pprint(builddefn('"$1" or "foo"', args))
+ (or
+ ('string', '$1')
+ ('string', 'foo'))
+ """
+ tree = self._parsedefn(defn)
+ if args:
+ args = set(args)
+ else:
+ args = set()
+ return self._relabelargs(tree, args)
diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -2254,52 +2254,13 @@ def _parsealiasdecl(decl):
raise error.ParseError(_('invalid token'), pos)
return parser.simplifyinfixops(tree, ('list',))
-def _relabelaliasargs(tree, args):
- return parser.aliasrules('', None, None, None)._relabelargs(tree, args)
-
-def _parsealiasdefn(defn, args):
- """Parse alias definition ``defn``
-
- This function marks alias argument references as ``_aliasarg``.
-
- ``args`` is a list of alias argument names, or None if the alias
- is declared as a symbol.
-
- This returns "tree" as parsing result.
-
- >>> def prettyformat(tree):
- ... return parser.prettyformat(tree, ('_aliasarg', 'string', 'symbol'))
- >>> args = ['$1', '$2', 'foo']
- >>> print prettyformat(_parsealiasdefn('$1 or foo', args))
- (or
- ('_aliasarg', '$1')
- ('_aliasarg', 'foo'))
- >>> try:
- ... _parsealiasdefn('$1 or $bar', args)
- ... except error.ParseError, inst:
- ... print parser.parseerrordetail(inst)
- '$' not for alias arguments
- >>> args = ['$1', '$10', 'foo']
- >>> print prettyformat(_parsealiasdefn('$10 or foobar', args))
- (or
- ('_aliasarg', '$10')
- ('symbol', 'foobar'))
- >>> print prettyformat(_parsealiasdefn('"$1" or "foo"', args))
- (or
- ('string', '$1')
- ('string', 'foo'))
- """
- if args:
- args = set(args)
- else:
- args = set()
-
+def _parsealiasdefn(defn):
+ """Parse alias definition ``defn``"""
p = parser.parser(elements)
tree, pos = p.parse(_tokenizealias(defn))
if pos != len(defn):
raise error.ParseError(_('invalid token'), pos)
- tree = parser.simplifyinfixops(tree, ('list', 'or'))
- return _relabelaliasargs(tree, args)
+ return parser.simplifyinfixops(tree, ('list', 'or'))
class revsetalias(object):
# whether own `error` information is already shown or not.
@@ -2313,7 +2274,7 @@ class revsetalias(object):
b($1) = ancestors($1) - ancestors(default)
'''
rules = parser.aliasrules(_('revset alias'),
- _parsealiasdecl, None, getlist)
+ _parsealiasdecl, _parsealiasdefn, getlist)
self.name, self.tree, self.args, self.error = rules._builddecl(name)
if self.error:
self.error = _('failed to parse the declaration of revset alias'
@@ -2321,7 +2282,7 @@ class revsetalias(object):
return
try:
- self.replacement = _parsealiasdefn(value, self.args)
+ self.replacement = rules._builddefn(value, self.args)
except error.ParseError as inst:
self.error = _('failed to parse the definition of revset alias'
' "%s": %s') % (self.name,
More information about the Mercurial-devel
mailing list