From 1319af2b6cd4631a28a969a4cb54f2f25b8ab8d5 Mon Sep 17 00:00:00 2001
From: Sebastian Koslowski <koslowski@kit.edu>
Date: Tue, 17 May 2016 13:24:54 +0200
Subject: grc: faulty callback code if setter call contained a variable block
id
(do-over of c85984f105106ff0a7e3b387d680e0f2f5884d55)
If a block contains a callback of the form
self.block_id.param = $param
the generators subst routine produced
self.block_id.self.param = self.param
due to a faulty splitting of the expression in expr_utils.py.
This should fix this problem by not tokenizing "VAR0.VAR1".
---
grc/core/generator/Generator.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
(limited to 'grc/core/generator/Generator.py')
diff --git a/grc/core/generator/Generator.py b/grc/core/generator/Generator.py
index ba272aba3f..fb7a3afb99 100644
--- a/grc/core/generator/Generator.py
+++ b/grc/core/generator/Generator.py
@@ -145,7 +145,7 @@ class TopBlockGenerator(object):
filter(lambda b: b.get_enabled() and not b.get_bypassed(), fg.blocks),
lambda b: b.get_id(), _get_block_sort_text
)
- deprecated_block_keys = set(block.get_name() for block in blocks if block.is_deprecated)
+ deprecated_block_keys = set(block.get_name() for block in blocks_all if block.is_deprecated)
for key in deprecated_block_keys:
Messages.send_warning("The block {!r} is deprecated.".format(key))
@@ -224,7 +224,8 @@ class TopBlockGenerator(object):
# Map var id to callbacks
def uses_var_id():
- return expr_utils.get_variable_dependencies(callback, [var_id])
+ used = expr_utils.get_variable_dependencies(callback, [var_id])
+ return used and 'self.' + var_id in callback # callback might contain var_id itself
callbacks = {}
for var_id in var_ids:
--
cgit v1.2.3