diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-05-21 13:50:48 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-05-21 13:50:48 +0200 |
| commit | 33c5096a47d1c882fde2f89af677d91b969df095 (patch) | |
| tree | 23149d767100bf7d7b241460f7ae4373d13f9165 | |
| parent | 4a739cb097d9e78593aae7d722a4834cd01cddd7 (diff) | |
Revert "grc: fix callback evaluation"
This reverts commit c85984f105106ff0a7e3b387d680e0f2f5884d55.
| -rw-r--r-- | grc/core/generator/Generator.py | 25 | ||||
| -rw-r--r-- | grc/core/generator/flow_graph.tmpl | 6 | ||||
| -rw-r--r-- | grc/core/utils/expr_utils.py | 4 |
3 files changed, 19 insertions, 16 deletions
diff --git a/grc/core/generator/Generator.py b/grc/core/generator/Generator.py index 2fdd8509f1..4788711a17 100644 --- a/grc/core/generator/Generator.py +++ b/grc/core/generator/Generator.py @@ -141,7 +141,7 @@ class TopBlockGenerator(object): pass return code - blocks_all = expr_utils.sort_objects( + blocks = expr_utils.sort_objects( filter(lambda b: b.get_enabled() and not b.get_bypassed(), fg.blocks), lambda b: b.get_id(), _get_block_sort_text ) @@ -150,7 +150,7 @@ class TopBlockGenerator(object): Messages.send_warning("The block {!r} is deprecated.".format(key)) # List of regular blocks (all blocks minus the special ones) - blocks = filter(lambda b: b not in (imports + parameters), blocks_all) + blocks = filter(lambda b: b not in (imports + parameters), blocks) for block in blocks: key = block.get_key() @@ -216,15 +216,18 @@ class TopBlockGenerator(object): msgs = filter(lambda c: c.is_msg(), fg.get_enabled_connections()) # List of variable names var_ids = [var.get_id() for var in parameters + variables] - replace_dict = dict((var_id, 'self.' + var_id) for var_id in var_ids) - callbacks_all = [] - for block in blocks_all: - callbacks_all.extend(expr_utils.expr_replace(cb, replace_dict) for cb in block.get_callbacks()) + # Prepend self. + replace_dict = dict([(var_id, 'self.%s' % var_id) for var_id in var_ids]) + # List of callbacks + callbacks = [ + expr_utils.expr_replace(cb, replace_dict) + for cb in sum([block.get_callbacks() for block in fg.get_enabled_blocks()], []) + ] # Map var id to callbacks - callbacks = {} - for var_id in var_ids: - callbacks[var_id] = [callback for callback in callbacks_all - if expr_utils.get_variable_dependencies(callback, ['self.' + var_id])] + var_id2cbs = dict([ + (var_id, filter(lambda c: expr_utils.get_variable_dependencies(c, [var_id]), callbacks)) + for var_id in var_ids + ]) # Load the namespace namespace = { 'title': title, @@ -238,7 +241,7 @@ class TopBlockGenerator(object): 'connection_templates': connection_templates, 'msgs': msgs, 'generate_options': self._generate_options, - 'callbacks': callbacks, + 'var_id2cbs': var_id2cbs, } # Build the template t = Template(open(FLOW_GRAPH_TEMPLATE, 'r').read(), namespace) diff --git a/grc/core/generator/flow_graph.tmpl b/grc/core/generator/flow_graph.tmpl index 07c4169525..ecdb89390e 100644 --- a/grc/core/generator/flow_graph.tmpl +++ b/grc/core/generator/flow_graph.tmpl @@ -13,7 +13,7 @@ ##@param connections the connections ##@param msgs the msg type connections ##@param generate_options the type of flow graph -##@param callbacks variable id map to callback strings +##@param var_id2cbs variable id map to callback strings ######################################################## #def indent($code) #set $code = '\n '.join(str($code).splitlines()) @@ -301,12 +301,12 @@ gr.io_signaturev($(len($io_sigs)), $(len($io_sigs)), [$(', '.join($size_strs))]) #if $flow_graph.get_option('thread_safe_setters') with self._lock: self.$id = $id - #for $callback in $callbacks[$id] + #for $callback in $var_id2cbs[$id] $indent($callback) #end for #else self.$id = $id - #for $callback in $callbacks[$id] + #for $callback in $var_id2cbs[$id] $indent($callback) #end for #end if diff --git a/grc/core/utils/expr_utils.py b/grc/core/utils/expr_utils.py index c5069583e0..66911757d6 100644 --- a/grc/core/utils/expr_utils.py +++ b/grc/core/utils/expr_utils.py @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA """ import string -VAR_CHARS = string.letters + string.digits + '_.' +VAR_CHARS = string.letters + string.digits + '_' class graph(object): @@ -118,7 +118,7 @@ def get_variable_dependencies(expr, vars): a subset of vars used in the expression """ expr_toks = expr_split(expr) - return set(var for var in vars if var in expr_toks) + return set(filter(lambda v: v in expr_toks, vars)) def get_graph(exprs): |