facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity

revset: inline _tokenizealias() into _parsealias()

Browse Source 
This helps factoring out common part between _parsealias() and parse().
This commit is contained in:
Yuya Nishihara 2016-04-17 12:57:27 +09:00
parent d41c3c219d
commit 2838ac3dce
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mercurial/revset.py
View File

@ -2217,18 +2217,12 @@ def optimize(x, small):
_aliassyminitletters = set(c for c in [chr(i) for i in xrange(256)]
if c.isalnum() or c in '._@$' or ord(c) > 127)
def _tokenizealias(program, lookup=None):
"""Parse alias declaration/definition into a stream of tokens
def _parsealias(spec):
"""Parse alias declaration/definition ``spec``
This allows symbol names to use also ``$`` as an initial letter
(for backward compatibility), and callers of this function should
examine whether ``$`` is used also for unexpected symbols or not.
"""
return tokenize(program, lookup=lookup,
syminitletters=_aliassyminitletters)
def _parsealias(spec):
"""Parse alias declaration/definition ``spec``
>>> _parsealias('foo($1)')
('func', ('symbol', 'foo'), ('symbol', '$1'))
@ -2238,7 +2232,7 @@ def _parsealias(spec):
ParseError: ('invalid token', 4)
"""
p = parser.parser(elements)
tree, pos = p.parse(_tokenizealias(spec))
tree, pos = p.parse(tokenize(spec, syminitletters=_aliassyminitletters))
if pos != len(spec):
raise error.ParseError(_('invalid token'), pos)
return parser.simplifyinfixops(tree, ('list', 'or'))