comparison mercurial/revset.py @ 29072:f86fa7168059

revset: inline _tokenizealias() into _parsealias()

This helps factoring out common part between _parsealias() and parse().

29071:2f58975eb2cb

# the set of valid characters for the initial letter of symbols in
# alias declarations and definitions
_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

    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'))
    >>> _parsealias('foo bar')
    Traceback (most recent call last):
      ...
    ParseError: ('invalid token', 4)
    """
    p = parser.parser(elements)
    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):

29072:f86fa7168059

# the set of valid characters for the initial letter of symbols in
# alias declarations and definitions
_aliassyminitletters = set(c for c in [chr(i) for i in xrange(256)]
                           if c.isalnum() or c in '._@$' or ord(c) > 127)

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.

    >>> _parsealias('foo($1)')
    ('func', ('symbol', 'foo'), ('symbol', '$1'))
    >>> _parsealias('foo bar')
    Traceback (most recent call last):
      ...
    ParseError: ('invalid token', 4)
    """
    p = parser.parser(elements)
    tree, pos = p.parse(tokenize(spec, syminitletters=_aliassyminitletters))
    if pos != len(spec):
        raise error.ParseError(_('invalid token'), pos)
    return parser.simplifyinfixops(tree, ('list', 'or'))

class _aliasrules(parser.basealiasrules):