nemunaire/nemubot
1
0
Fork 0
Code Releases Activity

Fix alias ranges

Browse source 
Args are now consumed when in ranges, and ranges with 1 bound now work
This commit is contained in:
Max 2015-10-06 23:23:42 +01:00
commit 461c62f596
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
modules/alias.py
View file

@ -130,18 +130,21 @@ def replace_variables(cnt, msg=None):
rv = re.match("([0-9]+)(:([0-9]*))?", res) rv = re.match("([0-9]+)(:([0-9]*))?", res)
if rv is not None: if rv is not None:
varI = int(rv.group(1)) - 1 varI = int(rv.group(1)) - 1
print(varI, len(msg.args))
if varI > len(msg.args): if varI > len(msg.args):
cnt = cnt.replace("${%s}" % res, "", 1) cnt = cnt.replace("${%s}" % res, "", 1)
elif rv.group(2) is not None: elif rv.group(2) is not None:
if rv.group(3) is not None: if rv.group(3) is not None and len(rv.group(3)):
varJ = int(rv.group(3)) - 1 varJ = int(rv.group(3)) - 1
cnt = cnt.replace("${%s}" % res, " ".join(msg.args[varI:varJ]), 1) cnt = cnt.replace("${%s}" % res, " ".join(msg.args[varI:varJ]), 1)
for v in range(varI, varJ):
unsetCnt.append(v)
else: else:
cnt = cnt.replace("${%s}" % res, " ".join(msg.args[varI:]), 1) cnt = cnt.replace("${%s}" % res, " ".join(msg.args[varI:]), 1)
for v in range(varI, len(msg.args)):
unsetCnt.append(v)
else: else:
cnt = cnt.replace("${%s}" % res, msg.args[varI], 1) cnt = cnt.replace("${%s}" % res, msg.args[varI], 1)
unsetCnt.append(varI) unsetCnt.append(varI)
else: else:
cnt = cnt.replace("${%s}" % res, get_variable(res), 1) cnt = cnt.replace("${%s}" % res, get_variable(res), 1)
for u in sorted(unsetCnt, reverse=True): for u in sorted(unsetCnt, reverse=True):