From 06651e61a29f2ca05523327a9f03d16446ba6170 Mon Sep 17 00:00:00 2001
From: Yuya Nishihara <yuya@tcha.org>
Date: Tue, 29 Mar 2016 00:05:14 +0900
Subject: [PATCH] revset: unify function that parses alias declaration and
 definition

We no longer need separate parsers. Only difference between _parsealiasdecl()
and _parsealiasdefn() is whether or not to flatten 'or' tree. Since alias
declaration should have no 'or' operator, there was no practical difference.
---
 mercurial/revset.py | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

diff --git a/mercurial/revset.py b/mercurial/revset.py
index dc2bd51d37..1bc7e91c66 100644
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -2234,35 +2234,27 @@ def _tokenizealias(program, lookup=None):
     return tokenize(program, lookup=lookup,
                     syminitletters=_aliassyminitletters)
 
-def _parsealiasdecl(decl):
-    """Parse alias declaration ``decl``
+def _parsealias(spec):
+    """Parse alias declaration/definition ``spec``
 
-    >>> _parsealiasdecl('foo($1)')
+    >>> _parsealias('foo($1)')
     ('func', ('symbol', 'foo'), ('symbol', '$1'))
-    >>> _parsealiasdecl('foo bar')
+    >>> _parsealias('foo bar')
     Traceback (most recent call last):
       ...
     ParseError: ('invalid token', 4)
     """
     p = parser.parser(elements)
-    tree, pos = p.parse(_tokenizealias(decl))
-    if pos != len(decl):
-        raise error.ParseError(_('invalid token'), pos)
-    return parser.simplifyinfixops(tree, ('list',))
-
-def _parsealiasdefn(defn):
-    """Parse alias definition ``defn``"""
-    p = parser.parser(elements)
-    tree, pos = p.parse(_tokenizealias(defn))
-    if pos != len(defn):
+    tree, pos = p.parse(_tokenizealias(spec))
+    if pos != len(spec):
         raise error.ParseError(_('invalid token'), pos)
     return parser.simplifyinfixops(tree, ('list', 'or'))
 
 class _aliasrules(parser.basealiasrules):
     """Parsing and expansion rule set of revset aliases"""
     _section = _('revset alias')
-    _parsedecl = staticmethod(_parsealiasdecl)
-    _parsedefn = staticmethod(_parsealiasdefn)
+    _parsedecl = staticmethod(_parsealias)
+    _parsedefn = staticmethod(_parsealias)
     _getlist = staticmethod(getlist)
 
 class revsetalias(object):