From 418395bd01a14bc08b5a6c2d942ed84438392986 Mon Sep 17 00:00:00 2001
From: Griatch <griatch@gmail.com>
Date: Fri, 24 Jun 2016 18:38:23 +0200
Subject: [PATCH] Added \| to the rest regex for nested inlinefuncs. Resolves
 #989.

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

diff --git a/evennia/utils/inlinefuncs.py b/evennia/utils/inlinefuncs.py
index 70d25719b..b07932fe6 100644
--- a/evennia/utils/inlinefuncs.py
+++ b/evennia/utils/inlinefuncs.py
@@ -195,10 +195,10 @@ _RE_TOKEN = re.compile(r"""
                         (?<!\\)\'\'\'(?P<singlequote>.*?)(?<!\\)\'\'\'| # unescaped single-triples (escapes all inside them)
                         (?<!\\)\"\"\"(?P<doublequote>.*?)(?<!\\)\"\"\"| # unescaped normal triple quotes (escapes all inside them)
                         (?P<comma>(?<!\\)\,)|                           # unescaped , (argument separator)
-                        (?P<end>(?<!\\)\))|                             # unescaped } (end of function call)
-                        (?P<start>(?<!\\)\$\w+\()|                      # unescaped $funcname{ (start of function call)
+                        (?P<end>(?<!\\)\))|                             # unescaped ) (end of function call)
+                        (?P<start>(?<!\\)\$\w+\()|                      # unescaped $funcname( (start of function call)
                         (?P<escaped>\\'|\\"|\\\)|\\$\w+\()|             # escaped tokens should re-appear in text
-                        (?P<rest>[\w\s.-\/#!%\^&\*;:=\-_`~\(}{\[\]]+|\"{1}|\'{1})     # everything else should also be included""",
+                        (?P<rest>[\w\s.-\/#!%\^&\*;:=\-_`~\|\(}{\[\]]+|\"{1}|\'{1}) # everything else should also be included""",
                         re.UNICODE + re.IGNORECASE + re.VERBOSE + re.DOTALL)