diff options
Diffstat (limited to 'mesonbuild/ast/printer.py')
| -rw-r--r-- | mesonbuild/ast/printer.py | 76 |
1 files changed, 35 insertions, 41 deletions
diff --git a/mesonbuild/ast/printer.py b/mesonbuild/ast/printer.py index f245a36..39e2cca 100644 --- a/mesonbuild/ast/printer.py +++ b/mesonbuild/ast/printer.py @@ -36,114 +36,111 @@ class AstPrinter(AstVisitor): self.is_newline = True self.last_level = 0 - def post_process(self): + def post_process(self) -> None: self.result = re.sub(r'\s+\n', '\n', self.result) - def append(self, data: str, node: mparser.BaseNode): - level = 0 - if node and hasattr(node, 'level'): - level = node.level - else: - level = self.last_level - self.last_level = level + def append(self, data: str, node: mparser.BaseNode) -> None: + self.last_level = node.level if self.is_newline: - self.result += ' ' * (level * self.indent) + self.result += ' ' * (node.level * self.indent) self.result += data self.is_newline = False - def append_padded(self, data: str, node: mparser.BaseNode): + def append_padded(self, data: str, node: mparser.BaseNode) -> None: if self.result[-1] not in [' ', '\n']: data = ' ' + data self.append(data + ' ', node) - def newline(self): + def newline(self) -> None: self.result += '\n' self.is_newline = True - def visit_BooleanNode(self, node: mparser.BooleanNode): + def visit_BooleanNode(self, node: mparser.BooleanNode) -> None: self.append('true' if node.value else 'false', node) - def visit_IdNode(self, node: mparser.IdNode): + def visit_IdNode(self, node: mparser.IdNode) -> None: + assert isinstance(node.value, str) self.append(node.value, node) - def visit_NumberNode(self, node: mparser.NumberNode): + def visit_NumberNode(self, node: mparser.NumberNode) -> None: self.append(str(node.value), node) - def visit_StringNode(self, node: mparser.StringNode): + def visit_StringNode(self, node: mparser.StringNode) -> None: + assert isinstance(node.value, str) self.append("'" + node.value + "'", node) - def visit_ContinueNode(self, node: mparser.ContinueNode): + def visit_ContinueNode(self, node: mparser.ContinueNode) -> None: self.append('continue', node) - def visit_BreakNode(self, node: mparser.BreakNode): + def visit_BreakNode(self, node: mparser.BreakNode) -> None: self.append('break', node) - def visit_ArrayNode(self, node: mparser.ArrayNode): + def visit_ArrayNode(self, node: mparser.ArrayNode) -> None: self.append('[', node) node.args.accept(self) self.append(']', node) - def visit_DictNode(self, node: mparser.DictNode): + def visit_DictNode(self, node: mparser.DictNode) -> None: self.append('{', node) node.args.accept(self) self.append('}', node) - def visit_OrNode(self, node: mparser.OrNode): + def visit_OrNode(self, node: mparser.OrNode) -> None: node.left.accept(self) self.append_padded('or', node) node.right.accept(self) - def visit_AndNode(self, node: mparser.AndNode): + def visit_AndNode(self, node: mparser.AndNode) -> None: node.left.accept(self) self.append_padded('and', node) node.right.accept(self) - def visit_ComparisonNode(self, node: mparser.ComparisonNode): + def visit_ComparisonNode(self, node: mparser.ComparisonNode) -> None: node.left.accept(self) self.append_padded(node.ctype, node) node.right.accept(self) - def visit_ArithmeticNode(self, node: mparser.ArithmeticNode): + def visit_ArithmeticNode(self, node: mparser.ArithmeticNode) -> None: node.left.accept(self) self.append_padded(arithmic_map[node.operation], node) node.right.accept(self) - def visit_NotNode(self, node: mparser.NotNode): + def visit_NotNode(self, node: mparser.NotNode) -> None: self.append_padded('not', node) node.value.accept(self) - def visit_CodeBlockNode(self, node: mparser.CodeBlockNode): + def visit_CodeBlockNode(self, node: mparser.CodeBlockNode) -> None: for i in node.lines: i.accept(self) self.newline() - def visit_IndexNode(self, node: mparser.IndexNode): + def visit_IndexNode(self, node: mparser.IndexNode) -> None: node.iobject.accept(self) self.append('[', node) node.index.accept(self) self.append(']', node) - def visit_MethodNode(self, node: mparser.MethodNode): + def visit_MethodNode(self, node: mparser.MethodNode) -> None: node.source_object.accept(self) self.append('.' + node.name + '(', node) node.args.accept(self) self.append(')', node) - def visit_FunctionNode(self, node: mparser.FunctionNode): + def visit_FunctionNode(self, node: mparser.FunctionNode) -> None: self.append(node.func_name + '(', node) node.args.accept(self) self.append(')', node) - def visit_AssignmentNode(self, node: mparser.AssignmentNode): + def visit_AssignmentNode(self, node: mparser.AssignmentNode) -> None: self.append(node.var_name + ' = ', node) node.value.accept(self) - def visit_PlusAssignmentNode(self, node: mparser.PlusAssignmentNode): + def visit_PlusAssignmentNode(self, node: mparser.PlusAssignmentNode) -> None: self.append(node.var_name + ' += ', node) node.value.accept(self) - def visit_ForeachClauseNode(self, node: mparser.ForeachClauseNode): - varnames = [x.value for x in node.varnames] + def visit_ForeachClauseNode(self, node: mparser.ForeachClauseNode) -> None: + varnames = [x for x in node.varnames] self.append_padded('foreach', node) self.append_padded(', '.join(varnames), node) self.append_padded(':', node) @@ -152,7 +149,7 @@ class AstPrinter(AstVisitor): node.block.accept(self) self.append('endforeach', node) - def visit_IfClauseNode(self, node: mparser.IfClauseNode): + def visit_IfClauseNode(self, node: mparser.IfClauseNode) -> None: prefix = '' for i in node.ifs: self.append_padded(prefix + 'if', node) @@ -163,23 +160,23 @@ class AstPrinter(AstVisitor): node.elseblock.accept(self) self.append('endif', node) - def visit_UMinusNode(self, node: mparser.UMinusNode): + def visit_UMinusNode(self, node: mparser.UMinusNode) -> None: self.append_padded('-', node) node.value.accept(self) - def visit_IfNode(self, node: mparser.IfNode): + def visit_IfNode(self, node: mparser.IfNode) -> None: node.condition.accept(self) self.newline() node.block.accept(self) - def visit_TernaryNode(self, node: mparser.TernaryNode): + def visit_TernaryNode(self, node: mparser.TernaryNode) -> None: node.condition.accept(self) self.append_padded('?', node) node.trueblock.accept(self) self.append_padded(':', node) node.falseblock.accept(self) - def visit_ArgumentNode(self, node: mparser.ArgumentNode): + def visit_ArgumentNode(self, node: mparser.ArgumentNode) -> None: break_args = (len(node.arguments) + len(node.kwargs)) > self.arg_newline_cutoff for i in node.arguments + list(node.kwargs.values()): if not isinstance(i, (mparser.ElementaryNode, mparser.IndexNode)): @@ -192,10 +189,7 @@ class AstPrinter(AstVisitor): if break_args: self.newline() for key, val in node.kwargs.items(): - if isinstance(key, str): - self.append(key, node) - else: - key.accept(self) + key.accept(self) self.append_padded(':', node) val.accept(self) self.append(', ', node) |