Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

simplify token replace, catch one-char end-of-string tokens

Browse source
This commit is contained in:
jesopo 2019-12-21 21:40:44 +00:00
parent 2218d4a888
commit b2c5ad041c
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/utils/parse.py
View file

@ -129,17 +129,13 @@ def format_tokens(s: str, names: typing.List[str], sigil: str="$"
while i < max: while i < max:
if s[i] == sigil: if s[i] == sigil:
if s[i+1] == sigil: if not s[i+1] == sigil:
i += 1 i += 1
else: for name in names:
sigil_found = True if len(name) <= (len(s)-i) and s[i:i+len(name)] == name:
elif sigil_found: tokens.append((i-1, "%s%s" % (sigil, name)))
sigil_found = False i += len(name)
for name in names: break
if len(name) <= (len(s)-i) and s[i:i+len(name)] == name:
tokens.append((i-1, "%s%s" % (sigil, name)))
i += len(name)
break
i += 1 i += 1
return tokens return tokens