summaryrefslogtreecommitdiff
path: root/gr-utils/python/modtool/core/add.py
diff options
context:
space:
mode:
authorArpit Gupta <guptarpit1997@gmail.com>2019-12-19 22:48:00 +0530
committerMarcus Müller <mmueller@gnuradio.org>2019-12-19 18:18:00 +0100
commit116f0401f54e4c8483952118c013b8c668eb3682 (patch)
treec4362ba8274ff68d78f8179603d3173481134775 /gr-utils/python/modtool/core/add.py
parentf3dcc45afea4fafa84b0c0e861031105a67bbaf2 (diff)
Block header parsing tool: GSoC 2019 (#2750)
* Add base.py file in cli module to import override Click functions * Create cli and core base module for AST generation of header blocks * Create basic CLI for blocktool with minimal support * Add Sequence Completer to CLI and successful generation of AST * CLI structure complete with parseheader command * Basic core structure complete * Add test script gr_blocktool to run the tool * Add JSON schema and validation for parsed json output file * Change properties and methods key to list in JSON schema * Create an independent api from blocktool * Bug fix for abslute path of the header files * Create basic parser core api * Parse the block header documentation * Expose the core api, minor bug fixes * Create the code pylint compatible * Modify cli to accept file_path as an argument, parse default values of make function arguments * Fix: Namespace parsing of block header file * Parse the io_signature from the implementation file of the block header * Create json file generator * Add key-value io_signature and docstring in json schema, change sample generated json output * Fix: squash an I/O parsing bug * Change directory structure for blocktool tests * Add Blocktool unittest * Removed empty strings, make the code pylint compatible * Use str.format() to get output * Implement YAML generator * Add a new CLI argument to parse a complete header directory * Add Logger to log errors without raising exceptions * Create output schema file in blocktool core * Change directory structure of blocktool and cli commands * write unittests for Blocktool Excceptions * Add sample yaml files * Simplify blocktool cli structure * Refactor blocktool exception handling * Split long blocktool unit-tests * Parse message ports from the implementation file * Add tests for parsed message port id, update sample json files * Add blocktool subdirectory, files in CMakeLists.txt * Remove test files to run Blocktool * Fix: locates implementation file by traversing the module * Integrate blocktool with modtool as an external plugin * Create proper formatting of io_signature for yaml files * Extend modtool makeyaml command to extend support for blocktool * Remove external plugin for modtool support, add blocktool independent script * Minor formatiing, change function name due to conflict with modtool function * Add support to read and add blocktool special comments in header file * Fix: Key Errors, Modify Documentation Reader * Raise warning in case of conflict in the parsed information and blocktool comments * Remove all the blocktool boilerplate cli code and provide minimal support * Remove gr_blocktool script and use blocktool as a python module * Major refactoring of the modtool cli structure to support the blocktool API * Check for PyGCCXML dependency during build * Add README.md for gr-blocktool and remove modtool cli warnings
Diffstat (limited to 'gr-utils/python/modtool/core/add.py')
-rw-r--r--gr-utils/python/modtool/core/add.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/gr-utils/python/modtool/core/add.py b/gr-utils/python/modtool/core/add.py
index e74509f930..2ec57f4d2a 100644
--- a/gr-utils/python/modtool/core/add.py
+++ b/gr-utils/python/modtool/core/add.py
@@ -161,7 +161,7 @@ class ModToolAdd(ModTool):
return
try:
append_re_line_sequence(self._file['cmlib'],
- 'list\(APPEND test_{}_sources.*\n'.format(self.info['modname']),
+ r'list\(APPEND test_{}_sources.*\n'.format(self.info['modname']),
'qa_{}.cc'.format(self.info['blockname']))
append_re_line_sequence(self._file['qalib'],
'#include.*\n',
@@ -183,7 +183,7 @@ class ModToolAdd(ModTool):
return
try:
append_re_line_sequence(self._file['cmlib'],
- 'list\(APPEND test_{}_sources.*\n'.format(self.info['modname']),
+ r'list\(APPEND test_{}_sources.*\n'.format(self.info['modname']),
'qa_{}.cc'.format(self.info['blockname']))
self.scm.mark_files_updated((self._file['cmlib'],))
except IOError:
@@ -255,7 +255,7 @@ class ModToolAdd(ModTool):
if re.search('#include', oldfile):
append_re_line_sequence(self._file['swig'], '^#include.*\n', include_str)
else: # I.e., if the swig file is empty
- regexp = re.compile('^%\{\n', re.MULTILINE)
+ regexp = re.compile(r'^%\{\n', re.MULTILINE)
oldfile = regexp.sub('%%{\n%s\n' % include_str, oldfile, count=1)
with open(self._file['swig'], 'w') as f:
f.write(oldfile)