Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix of FuncParser nested any-output. Resolve #2908, #2902

Browse source
This commit is contained in:
Griatch 2022-10-13 20:05:42 +02:00
parent 336ef18eb8
commit 4fb5268acd
3 changed files with 52 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
evennia/utils/funcparser.py
View file

@ -354,7 +354,6 @@ class FuncParser:
if curr_func:
# we are starting a nested funcdef
# return_str = True
if len(callstack) > _MAX_NESTING:
# stack full - ignore this function
if raise_errors:

9
evennia/utils/tests/test_funcparser.py
View file

@ -788,9 +788,12 @@ class TestCallableSearch(test_resources.BaseEvenniaTest):
# get random result from the possible matches
string = "$choice($objlist(beach,category=zone,type=tag))"
from evennia import set_trace
set_trace()
ret = parser.parse_to_any(string, caller=self.char1, raise_errors=True)
self.assertIn(ret, [self.obj1, self.obj2])
# test wrapping in $obj(), should just pass object through
string = "$obj($choice($objlist(beach,category=zone,type=tag)))"
ret = parser.parse_to_any(string, caller=self.char1, raise_errors=True)
self.assertIn(ret, [self.obj1, self.obj2])