diff options
| author | Andrej Rode <mail@andrejro.de> | 2018-12-30 17:22:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-30 17:22:24 +0100 |
| commit | 529531fa7dc4ad7c74393dcdd07870d347f34b2e (patch) | |
| tree | 7abab3b0f854f7b74ef270d3e586c66df0e938a9 | |
| parent | 7e20d8a2edf3b80d9c3e7efb44972b7e3b653e70 (diff) | |
| parent | 9d6fc4e08a64dfc4e6bbabbc5eba0b8fef41d608 (diff) | |
grc: Fix flowgraph generation bugs introduced with C++ generation
The C++ generation in GRC introduced some bugs leading to GRC not being able to generate any flowgraphs. This is fixed now.
| -rw-r--r-- | grc/core/blocks/block.py | 3 | ||||
| -rw-r--r-- | grc/core/generator/top_block.py | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/grc/core/blocks/block.py b/grc/core/blocks/block.py index d795d04912..9280d8fda7 100644 --- a/grc/core/blocks/block.py +++ b/grc/core/blocks/block.py @@ -87,7 +87,8 @@ class Block(Element): self.active_sinks = [] # on rewrite self.states = {'state': True} - self.orig_cpp_templates = self.cpp_templates # The original template, in case we have to edit it when transpiling to C++ + if 'cpp' in self.flags: + self.orig_cpp_templates = self.cpp_templates # The original template, in case we have to edit it when transpiling to C++ # region Rewrite_and_Validation def rewrite(self): diff --git a/grc/core/generator/top_block.py b/grc/core/generator/top_block.py index cab1bf71cb..fad541ea34 100644 --- a/grc/core/generator/top_block.py +++ b/grc/core/generator/top_block.py @@ -114,7 +114,7 @@ class TopBlockGenerator(object): src = block.params['source_code'].get_value() output.append((file_path, src)) - namespace = { + self.namespace = { 'flow_graph': fg, 'variables': variables, 'parameters': parameters, @@ -302,7 +302,6 @@ class TopBlockGenerator(object): for con in sorted(connections, key=by_domain_and_blocks): template = templates[con.type] code = template.render(make_port_sig=make_port_sig, source=con.source_port, sink=con.sink_port) - code = 'self.' + code rendered.append(code) return rendered |