diff options
| author | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-03-03 18:06:33 +0100 |
|---|---|---|
| committer | Daniel Mensinger <daniel@mensinger-ka.de> | 2019-03-04 13:00:31 +0100 |
| commit | 617445ea72940b6a5e88a57b09889582dacf1f16 (patch) | |
| tree | 408b708ce4c4a03aac26468ebad9b81a0b9203b1 /mesonbuild | |
| parent | 594bf678c7aaf676ce02d7d8a7d33e04c42c6b39 (diff) | |
| download | meson-617445ea72940b6a5e88a57b09889582dacf1f16.zip meson-617445ea72940b6a5e88a57b09889582dacf1f16.tar.gz meson-617445ea72940b6a5e88a57b09889582dacf1f16.tar.bz2 | |
rewriter: Make sure variable names are valid
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/rewriter.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/mesonbuild/rewriter.py b/mesonbuild/rewriter.py index 6a97dd0..1b4c441 100644 --- a/mesonbuild/rewriter.py +++ b/mesonbuild/rewriter.py @@ -703,25 +703,29 @@ class Rewriter: elif cmd['operation'] == 'target_add': if target is not None: - mlog.error('Can not add target', mlog.bold(cmd['target']), 'because it already exists') - return + mlog.error('Can not add target', mlog.bold(cmd['target']), 'because it already exists', *self.on_error()) + return self.handle_error() + + id_base = re.sub(r'[- ]', '_', cmd['target']) + target_id = id_base + '_exe' if cmd['target_type'] == 'executable' else '_lib' + source_id = id_base + '_src' # Build src list src_arg_node = ArgumentNode(Token('string', cmd['subdir'], 0, 0, 0, None, '')) src_arr_node = ArrayNode(src_arg_node, 0, 0, 0, 0) src_far_node = ArgumentNode(Token('string', cmd['subdir'], 0, 0, 0, None, '')) src_fun_node = FunctionNode(cmd['subdir'], 0, 0, 0, 0, 'files', src_far_node) - src_ass_node = AssignmentNode(cmd['subdir'], 0, 0, '{}_src'.format(cmd['target']), src_fun_node) + src_ass_node = AssignmentNode(cmd['subdir'], 0, 0, source_id, src_fun_node) src_arg_node.arguments = [StringNode(Token('string', cmd['subdir'], 0, 0, 0, None, x)) for x in cmd['sources']] src_far_node.arguments = [src_arr_node] # Build target tgt_arg_node = ArgumentNode(Token('string', cmd['subdir'], 0, 0, 0, None, '')) tgt_fun_node = FunctionNode(cmd['subdir'], 0, 0, 0, 0, cmd['target_type'], tgt_arg_node) - tgt_ass_node = AssignmentNode(cmd['subdir'], 0, 0, '{}_tgt'.format(cmd['target']), tgt_fun_node) + tgt_ass_node = AssignmentNode(cmd['subdir'], 0, 0, target_id, tgt_fun_node) tgt_arg_node.arguments = [ StringNode(Token('string', cmd['subdir'], 0, 0, 0, None, cmd['target'])), - IdNode(Token('string', cmd['subdir'], 0, 0, 0, None, '{}_src'.format(cmd['target']))) + IdNode(Token('string', cmd['subdir'], 0, 0, 0, None, source_id)) ] src_ass_node.accept(AstIndentationGenerator()) |