diff options
| author | Sebastian Koslowski <koslowski@kit.edu> | 2016-04-27 14:19:04 +0200 |
|---|---|---|
| committer | Sebastian Koslowski <koslowski@kit.edu> | 2016-04-27 16:47:08 +0200 |
| commit | c85984f105106ff0a7e3b387d680e0f2f5884d55 (patch) | |
| tree | c29638545c98d88bf59b09771ff39c4d8e557469 | |
| parent | ec7ef7fe2942bf73e7ff9166530d25dd605a1fce (diff) | |
grc: fix callback evaluation
| -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, 16 insertions, 19 deletions
diff --git a/grc/core/generator/Generator.py b/grc/core/generator/Generator.py index 91671072d6..641bdea6e6 100644 --- a/grc/core/generator/Generator.py +++ b/grc/core/generator/Generator.py @@ -141,12 +141,12 @@ class TopBlockGenerator(object): pass return code - blocks = expr_utils.sort_objects( + blocks_all = 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 ) # List of regular blocks (all blocks minus the special ones) - blocks = filter(lambda b: b not in (imports + parameters), blocks) + blocks = filter(lambda b: b not in (imports + parameters), blocks_all) for block in blocks: key = block.get_key() @@ -212,18 +212,15 @@ 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] - # 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()], []) - ] + 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()) # Map var id to callbacks - var_id2cbs = dict([ - (var_id, filter(lambda c: expr_utils.get_variable_dependencies(c, [var_id]), callbacks)) - for var_id in var_ids - ]) + 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])] # Load the namespace namespace = { 'title': title, @@ -237,7 +234,7 @@ class TopBlockGenerator(object): 'connection_templates': connection_templates, 'msgs': msgs, 'generate_options': self._generate_options, - 'var_id2cbs': var_id2cbs, + 'callbacks': callbacks, } # 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 ecdb89390e..07c4169525 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 var_id2cbs variable id map to callback strings +##@param callbacks 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 $var_id2cbs[$id] + #for $callback in $callbacks[$id] $indent($callback) #end for #else self.$id = $id - #for $callback in $var_id2cbs[$id] + #for $callback in $callbacks[$id] $indent($callback) #end for #end if diff --git a/grc/core/utils/expr_utils.py b/grc/core/utils/expr_utils.py index 66911757d6..c5069583e0 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(filter(lambda v: v in expr_toks, vars)) + return set(var for var in vars if var in expr_toks) def get_graph(exprs): |