From ef95726be60d4cd89d992999c5002724bd2e7ee6 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Sat, 30 Sep 2017 23:25:27 +0200
Subject: [PATCH] Fix strange regression in inlinefunc. Resolve #1307.

---
 evennia/utils/inlinefuncs.py | 110 +++++++++++++++++------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/evennia/utils/inlinefuncs.py b/evennia/utils/inlinefuncs.py
index 8baa89cabc..e103e217d7 100644
--- a/evennia/utils/inlinefuncs.py
+++ b/evennia/utils/inlinefuncs.py
@@ -283,64 +283,64 @@ def parse_inlinefunc(string, strip=False, **kwargs):
         # no cached stack; build a new stack and continue
         stack = ParseStack()
 
-    # process string on stack
-    ncallable = 0
-    for match in _RE_TOKEN.finditer(string):
-        gdict = match.groupdict()
-        if gdict["singlequote"]:
-            stack.append(gdict["singlequote"])
-        elif gdict["doublequote"]:
-            stack.append(gdict["doublequote"])
-        elif gdict["end"]:
-            if ncallable <= 0:
-                stack.append(")")
-                continue
-            args = []
-            while stack:
-                operation = stack.pop()
-                if callable(operation):
-                    if not strip:
-                        stack.append((operation, [arg for arg in reversed(args)]))
-                    ncallable -= 1
-                    break
+        # process string on stack
+        ncallable = 0
+        for match in _RE_TOKEN.finditer(string):
+            gdict = match.groupdict()
+            if gdict["singlequote"]:
+                stack.append(gdict["singlequote"])
+            elif gdict["doublequote"]:
+                stack.append(gdict["doublequote"])
+            elif gdict["end"]:
+                if ncallable <= 0:
+                    stack.append(")")
+                    continue
+                args = []
+                while stack:
+                    operation = stack.pop()
+                    if callable(operation):
+                        if not strip:
+                            stack.append((operation, [arg for arg in reversed(args)]))
+                        ncallable -= 1
+                        break
+                    else:
+                        args.append(operation)
+            elif gdict["start"]:
+                funcname = _RE_STARTTOKEN.match(gdict["start"]).group(1)
+                try:
+                    # try to fetch the matching inlinefunc from storage
+                    stack.append(_INLINE_FUNCS[funcname])
+                except KeyError:
+                    stack.append(_INLINE_FUNCS["nomatch"])
+                    stack.append(funcname)
+                ncallable += 1
+            elif gdict["escaped"]:
+                # escaped tokens
+                token = gdict["escaped"].lstrip("\\")
+                stack.append(token)
+            elif gdict["comma"]:
+                if ncallable > 0:
+                    # commas outside strings and inside a callable are
+                    # used to mark argument separation - we use None
+                    # in the stack to indicate such a separation.
+                    stack.append(None)
                 else:
-                    args.append(operation)
-        elif gdict["start"]:
-            funcname = _RE_STARTTOKEN.match(gdict["start"]).group(1)
-            try:
-                # try to fetch the matching inlinefunc from storage
-                stack.append(_INLINE_FUNCS[funcname])
-            except KeyError:
-                stack.append(_INLINE_FUNCS["nomatch"])
-                stack.append(funcname)
-            ncallable += 1
-        elif gdict["escaped"]:
-            # escaped tokens
-            token = gdict["escaped"].lstrip("\\")
-            stack.append(token)
-        elif gdict["comma"]:
-            if ncallable > 0:
-                # commas outside strings and inside a callable are
-                # used to mark argument separation - we use None
-                # in the stack to indicate such a separation.
-                stack.append(None)
+                    # no callable active - just a string
+                    stack.append(",")
             else:
-                # no callable active - just a string
-                stack.append(",")
+                # the rest
+                stack.append(gdict["rest"])
+
+        if ncallable > 0:
+            # this means not all inlinefuncs were complete
+            return string
+
+        if _STACK_MAXSIZE > 0 and _STACK_MAXSIZE < len(stack):
+            # if stack is larger than limit, throw away parsing
+            return string + gdict["stackfull"](*args, **kwargs)
         else:
-            # the rest
-            stack.append(gdict["rest"])
-
-    if ncallable > 0:
-        # this means not all inlinefuncs were complete
-        return string
-
-    if _STACK_MAXSIZE > 0 and _STACK_MAXSIZE < len(stack):
-        # if stack is larger than limit, throw away parsing
-        return string + gdict["stackfull"](*args, **kwargs)
-    else:
-        # cache the stack
-        _PARSING_CACHE[string] = stack
+            # cache the stack
+            _PARSING_CACHE[string] = stack
 
     # run the stack recursively
     def _run_stack(item, depth=0):