Andreas/evennia
1
0
Fork 0
mirror of https://github.com/evennia/evennia.git synced 2026-03-27 02:06:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some further cleanup.

Browse source
This commit is contained in:
Griatch 2015-11-18 14:02:13 +01:00
parent 786edf4677
commit d41b1437f2
1 changed files with 4 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
evennia/utils/nested_inlinefuncs.py
View file

@ -101,20 +101,6 @@ def crop(*args, **kwargs):
return utils.crop(text, width=width, suffix=suffix)
def clr(*args, **kwargs):
"""
Colorize text. $crop{clr, text}
"""
clr, text = "|n", ""
nargs = len(args)
if nargs > 0:
clr = args[0]
if nargs > 1:
text = args[1]
return "|" + clr.lstrip("|") + text + "|n"
# we specify a default nomatch function to use if no matching func was
# found. This will be overloaded by any nomatch function defined in
# the imported modules.
@ -140,8 +126,8 @@ except AttributeError:
_RE_STARTTOKEN = re.compile(r"(?<!\\)\$(\w+)\{") # unescaped $funcname( (start of function call)
_RE_TOKEN = re.compile(r"""(?<!\\)'''(?P<singlequote>.*?)(?<!\\)'''| # unescaped '' (escapes all inside them)
(?<!\\)\"\"\"(?P<triplequote>.*?)(?<!\\)\"\"\"| # unescaped triple quote (escapes all inside them)
_RE_TOKEN = re.compile(r"""(?<!\\)\'\'\'(?P<singlequote>.*?)(?<!\\)\'\'\'| # unescaped single-triples (escapes all inside them)
(?<!\\)\"\"\"(?P<doublequote>.*?)(?<!\\)\"\"\"| # unescaped triple quotes (escapes all inside them)
(?P<comma>(?<!\\)\,)| # unescaped , (argument lists) - this is thrown away
(?P<end>(?<!\\)\})| # unescaped ) (end of function call)
(?P<start>(?<!\\)\$\w+\{)| # unescaped $funcname( (start of function call)
@ -228,8 +214,8 @@ def parse_inlinefunc(string, strip=False, **kwargs):
gdict = match.groupdict()
if gdict["singlequote"]:
stack.append(gdict["singlequote"])
elif gdict["triplequote"]:
stack.append(gdict["triplequote"])
elif gdict["doublequote"]:
stack.append(gdict["doublequote"])
elif gdict["end"]:
if ncallable <= 0:
stack.append(")")