diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2022-05-27 13:57:57 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-02 04:59:52 +0000 |
| commit | 18ab54ffb1a535c98b0293c04ab636927f1e6a60 (patch) | |
| tree | 8709c108c643dc87458a77c8a51147228c538d35 | |
| parent | 4ea4ab05497e59966dad0df56709df3152139e6c (diff) | |
qtpy2cpp: Add return token
As a drive-by remove some new lines produced which were apparently
necessary due to the missing handling of return statements.
Task-number: PYSIDE-1945
Change-Id: Id8187b599e3163c2b6e5359c4a79214f70fe4b1d
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Reviewed-by: Shyamnath Premnadh <Shyamnath.Premnadh@qt.io>
(cherry picked from commit 4a229aca8f8347c470f174f1290731175584b8c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | tools/qtpy2cpp_lib/visitor.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/tools/qtpy2cpp_lib/visitor.py b/tools/qtpy2cpp_lib/visitor.py index f5476ac10..35d659d64 100644 --- a/tools/qtpy2cpp_lib/visitor.py +++ b/tools/qtpy2cpp_lib/visitor.py @@ -101,7 +101,6 @@ class ConvertVisitor(ast.NodeVisitor, CppFormatter): self._output_file.write(' + ') def visit_Assign(self, node): - self._output_file.write('\n') self.INDENT() line_no = node.lineno if hasattr(node, 'lineno') else -1 for target in node.targets: @@ -162,7 +161,6 @@ class ConvertVisitor(ast.NodeVisitor, CppFormatter): self._output_file.write(" == ") def visit_Expr(self, node): - self._output_file.write('\n') self.INDENT() self.generic_visit(node) self._output_file.write(';\n') @@ -273,6 +271,13 @@ class ConvertVisitor(ast.NodeVisitor, CppFormatter): self.generic_visit(node) self._output_file.write(" >> ") + def visit_Return(self, node): + self.indent_string("return") + if node.value: + self._output_file.write(" ") + self.generic_visit(node) + self._output_file.write(";\n") + def visit_Str(self, node): self.generic_visit(node) self._output_file.write(format_literal(node)) |