[alias] Variable replacement can operate on slice list.
In addition to ${1}, ${2}, ... you can now use slice: ${1:5} or ${1:}.
The effect is to join arguments with a space character.
This commit is contained in:
parent
dc681fdc35
commit
3b8195b81b
1 changed files with 16 additions and 5 deletions
|
|
@ -142,12 +142,23 @@ def replace_variables(cnt, msg=None):
|
||||||
return [replace_variables(c, msg) for c in cnt]
|
return [replace_variables(c, msg) for c in cnt]
|
||||||
|
|
||||||
unsetCnt = list()
|
unsetCnt = list()
|
||||||
for res in re.findall("\\$\{(?P<name>[a-zA-Z0-9]+)\}", cnt):
|
for res in re.findall("\\$\{(?P<name>[a-zA-Z0-9:]+)\}", cnt):
|
||||||
try:
|
rv = re.match("([0-9]+)(:([0-9]*))?", res)
|
||||||
varI = int(res) - 1
|
if rv is not None:
|
||||||
cnt = cnt.replace("${%s}" % res, msg.args[varI], 1)
|
varI = int(rv.group(1)) - 1
|
||||||
|
print(varI, len(msg.args))
|
||||||
|
if varI > len(msg.args):
|
||||||
|
cnt = cnt.replace("${%s}" % res, "", 1)
|
||||||
|
elif rv.group(2) is not None:
|
||||||
|
if rv.group(3) is not None:
|
||||||
|
varJ = int(rv.group(3)) - 1
|
||||||
|
cnt = cnt.replace("${%s}" % res, " ".join(msg.args[varI:varJ]), 1)
|
||||||
|
else:
|
||||||
|
cnt = cnt.replace("${%s}" % res, " ".join(msg.args[varI:]), 1)
|
||||||
|
else:
|
||||||
|
cnt = cnt.replace("${%s}" % res, msg.args[varI], 1)
|
||||||
unsetCnt.append(varI)
|
unsetCnt.append(varI)
|
||||||
except:
|
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):
|
||||||
msg.args.pop(u)
|
msg.args.pop(u)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue