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

parser: make buildargsdict() precompute position where keyword args start

Browse Source 
This prepares for adding *varargs support. See the next patch.
This commit is contained in:
Yuya Nishihara 2017-01-09 15:15:21 +09:00
parent bb277b3ff3
commit 3d36c04638
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mercurial/parser.py
View File

@ -96,17 +96,18 @@ def buildargsdict(trees, funcname, keys, keyvaluenode, keynode):
Invalid keywords or too many positional arguments are rejected, but
missing arguments are just omitted.
"""
kwstart = next((i for i, x in enumerate(trees) if x[0] == keyvaluenode),
len(trees))
if len(trees) > len(keys):
raise error.ParseError(_("%(func)s takes at most %(nargs)d arguments")
% {'func': funcname, 'nargs': len(keys)})
args = {}
# consume positional arguments
for k, x in zip(keys, trees):
if x[0] == keyvaluenode:
break
for k, x in zip(keys, trees[:kwstart]):
args[k] = x
assert len(args) == kwstart
# remainder should be keyword arguments
for x in trees[len(args):]:
for x in trees[kwstart:]:
if x[0] != keyvaluenode or x[1][0] != keynode:
raise error.ParseError(_("%(func)s got an invalid argument")
% {'func': funcname})