From 256e883e22f798a74ccb67d87d68050c44d87a16 Mon Sep 17 00:00:00 2001 From: Joe Wreschnig Date: Tue, 16 Mar 2010 19:44:09 -0700 Subject: [PATCH] NumberDef: Bind random and builtins in a separate dictionary. Replace $rand with random(), to allow it to be used twice with different results in the same expression. --- bulletml/expr.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/bulletml/expr.py b/bulletml/expr.py index 33f7d44..7654fed 100644 --- a/bulletml/expr.py +++ b/bulletml/expr.py @@ -29,6 +29,8 @@ class NumberDef(object): (2+$1)*0.3 """ + + GLOBALS = dict(random=random.random, __builtins__={}) def __init__(self, expr): try: expr = expr.__original @@ -37,14 +39,13 @@ class NumberDef(object): self.__original = expr repl = lambda match: "params[%d]" % (int(match.group()[1:]) - 1) expr = re.sub(r"\$\d+", repl, expr.lower()) - self.__expr = expr.replace("$rand", "rand").replace("$rank", "rank") + self.__expr = expr.replace("$rand", "random()").replace("$rank", "rank") try: try: self.__value = eval(self.__expr, dict(__builtins__={})) except NameError: - fake = [0] * 99 - variables = dict(rand=1, rank=1, params=fake, __builtins__={}) - value = eval(self.__expr, variables) + variables = dict(rank=1, params=[0] * 99) + value = eval(self.__expr, self.GLOBALS, variables) if not isinstance(value, (int, float)): raise TypeError(expr) self.__value = None @@ -56,9 +57,8 @@ class NumberDef(object): """Evaluate the expression and return its value.""" if self.__value is not None: return self.__value - rand = random.random() - variables = { 'rand': rand, 'rank': rank, 'params': params } - return eval(self.__expr, variables) + variables = { 'rank': rank, 'params': params } + return eval(self.__expr, self.GLOBALS, variables) def __repr__(self): return "%s(%r)" % (type(self).__name__, self.__original) -- 2.30.2