From ccad493e85e46bf0e78cfac8b77b03b7be75a396 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Tue, 15 Jan 2019 18:45:25 +0100 Subject: Basic AST visitor pattern --- mesonbuild/ast/printer.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 mesonbuild/ast/printer.py (limited to 'mesonbuild/ast/printer.py') diff --git a/mesonbuild/ast/printer.py b/mesonbuild/ast/printer.py new file mode 100644 index 0000000..c1710be --- /dev/null +++ b/mesonbuild/ast/printer.py @@ -0,0 +1,22 @@ +# Copyright 2018 The Meson development team + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# This class contains the basic functionality needed to run any interpreter +# or an interpreter-based tool + +from . import AstVisitor + +class AstPrinter(AstVisitor): + def __init__(self): + pass -- cgit v1.1 From 46320bfba89bf088dfe760ee1ff39658b5eb559f Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Tue, 15 Jan 2019 21:59:49 +0100 Subject: Added Ast printer --- mesonbuild/ast/printer.py | 192 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 190 insertions(+), 2 deletions(-) (limited to 'mesonbuild/ast/printer.py') diff --git a/mesonbuild/ast/printer.py b/mesonbuild/ast/printer.py index c1710be..b055480 100644 --- a/mesonbuild/ast/printer.py +++ b/mesonbuild/ast/printer.py @@ -15,8 +15,196 @@ # This class contains the basic functionality needed to run any interpreter # or an interpreter-based tool +from .. import mparser from . import AstVisitor +arithmic_map = { + 'add': '+', + 'sub': '-', + 'mod': '%', + 'mul': '*', + 'div': '/' +} + class AstPrinter(AstVisitor): - def __init__(self): - pass + def __init__(self, indent: int = 2, arg_newline_cutoff: int = 5): + self.result = '' + self.indent = indent + self.arg_newline_cutoff = arg_newline_cutoff + self.level = 0 + self.ci = '' + self.is_newline = True + + def inc_indent(self): + self.level += self.indent + + def dec_indent(self): + self.level -= self.indent + + def append(self, data: str): + if self.is_newline: + self.result += ' ' * self.level + self.result += data + self.is_newline = False + + def appendS(self, data: str): + if self.result[-1] not in [' ', '\n']: + data = ' ' + data + self.append(data + ' ') + + def newline(self): + self.result += '\n' + self.is_newline = True + + def visit_BooleanNode(self, node: mparser.BooleanNode): + self.append('true' if node.value else 'false') + + def visit_IdNode(self, node: mparser.IdNode): + self.append(node.value) + + def visit_NumberNode(self, node: mparser.NumberNode): + self.append(str(node.value)) + + def visit_StringNode(self, node: mparser.StringNode): + self.append("'" + node.value + "'") + + def visit_ContinueNode(self, node: mparser.ContinueNode): + self.append('continue') + + def visit_BreakNode(self, node: mparser.BreakNode): + self.append('break') + + def visit_ArrayNode(self, node: mparser.ArrayNode): + self.append('[') + self.inc_indent() + node.args.accept(self) + self.dec_indent() + self.append(']') + + def visit_DictNode(self, node: mparser.DictNode): + self.append('{') + self.inc_indent() + node.args.accept(self) + self.dec_indent() + self.append('}') + + def visit_OrNode(self, node: mparser.OrNode): + node.left.accept(self) + self.appendS('or') + node.right.accept(self) + + def visit_AndNode(self, node: mparser.AndNode): + node.left.accept(self) + self.appendS('and') + node.right.accept(self) + + def visit_ComparisonNode(self, node: mparser.ComparisonNode): + node.left.accept(self) + self.appendS(mparser.comparison_map[node.ctype]) + node.right.accept(self) + + def visit_ArithmeticNode(self, node: mparser.ArithmeticNode): + node.left.accept(self) + self.appendS(arithmic_map[node.operation]) + node.right.accept(self) + + def visit_NotNode(self, node: mparser.NotNode): + self.appendS('not') + node.value.accept(self) + + def visit_CodeBlockNode(self, node: mparser.CodeBlockNode): + for i in node.lines: + i.accept(self) + self.newline() + + def visit_IndexNode(self, node: mparser.IndexNode): + self.append('[') + node.index.accept(self) + self.append(']') + + def visit_MethodNode(self, node: mparser.MethodNode): + node.source_object.accept(self) + self.append('.' + node.name + '(') + self.inc_indent() + node.args.accept(self) + self.dec_indent() + self.append(')') + + def visit_FunctionNode(self, node: mparser.FunctionNode): + self.append(node.func_name + '(') + self.inc_indent() + node.args.accept(self) + self.dec_indent() + self.append(')') + + def visit_AssignmentNode(self, node: mparser.AssignmentNode): + self.append(node.var_name + ' = ') + node.value.accept(self) + + def visit_PlusAssignmentNode(self, node: mparser.PlusAssignmentNode): + self.append(node.var_name + ' += ') + node.value.accept(self) + + def visit_ForeachClauseNode(self, node: mparser.ForeachClauseNode): + varnames = [x.value for x in node.varnames] + self.appendS('foreach') + self.appendS(', '.join(varnames)) + self.appendS(':') + node.items.accept(self) + self.newline() + self.inc_indent() + node.block.accept(self) + self.dec_indent() + self.append('endforeach') + + def visit_IfClauseNode(self, node: mparser.IfClauseNode): + prefix = '' + for i in node.ifs: + self.appendS(prefix + 'if') + prefix = 'el' + i.accept(self) + if node.elseblock: + self.append('else') + self.indent() + self.inc_indent() + node.elseblock.accept(self) + self.dec_indent() + self.append('endif') + + def visit_UMinusNode(self, node: mparser.UMinusNode): + self.appendS('-') + node.value.accept(self) + + def visit_IfNode(self, node: mparser.IfNode): + node.condition.accept(self) + self.newline() + self.inc_indent() + node.block.accept(self) + self.dec_indent() + + def visit_TernaryNode(self, node: mparser.TernaryNode): + node.condition.accept(self) + self.appendS('?') + node.trueblock.accept(self) + self.appendS(':') + node.falseblock.accept(self) + + def visit_ArgumentNode(self, node: mparser.ArgumentNode): + break_args = True if (len(node.arguments) + len(node.kwargs)) > self.arg_newline_cutoff else False + for i in node.arguments + list(node.kwargs.values()): + if not isinstance(i, mparser.ElementaryNode): + break_args = True + if break_args: + self.newline() + for i in node.arguments: + i.accept(self) + self.append(',') + if break_args: + self.newline() + for key, val in node.kwargs.items(): + self.append(key) + self.appendS(':') + val.accept(self) + self.append(',') + if break_args: + self.newline() -- cgit v1.1 From 277dc10a5d21eaed884ef8674ca6cc1bec547ec0 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Sun, 20 Jan 2019 17:43:09 +0100 Subject: AST post processing --- mesonbuild/ast/printer.py | 109 +++++++++++++++++++--------------------------- 1 file changed, 45 insertions(+), 64 deletions(-) (limited to 'mesonbuild/ast/printer.py') diff --git a/mesonbuild/ast/printer.py b/mesonbuild/ast/printer.py index b055480..aab5a30 100644 --- a/mesonbuild/ast/printer.py +++ b/mesonbuild/ast/printer.py @@ -1,4 +1,4 @@ -# Copyright 2018 The Meson development team +# Copyright 2019 The Meson development team # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -31,85 +31,77 @@ class AstPrinter(AstVisitor): self.result = '' self.indent = indent self.arg_newline_cutoff = arg_newline_cutoff - self.level = 0 self.ci = '' self.is_newline = True - def inc_indent(self): - self.level += self.indent - - def dec_indent(self): - self.level -= self.indent - - def append(self, data: str): + def append(self, data: str, node: mparser.BaseNode): + level = 0 + if node and hasattr(node, 'level'): + level = node.level if self.is_newline: - self.result += ' ' * self.level + self.result += ' ' * (level * self.indent) self.result += data self.is_newline = False - def appendS(self, data: str): + def appendS(self, data: str, node: mparser.BaseNode): if self.result[-1] not in [' ', '\n']: data = ' ' + data - self.append(data + ' ') + self.append(data + ' ', node) def newline(self): self.result += '\n' self.is_newline = True def visit_BooleanNode(self, node: mparser.BooleanNode): - self.append('true' if node.value else 'false') + self.append('true' if node.value else 'false', node) def visit_IdNode(self, node: mparser.IdNode): - self.append(node.value) + self.append(node.value, node) def visit_NumberNode(self, node: mparser.NumberNode): - self.append(str(node.value)) + self.append(str(node.value), node) def visit_StringNode(self, node: mparser.StringNode): - self.append("'" + node.value + "'") + self.append("'" + node.value + "'", node) def visit_ContinueNode(self, node: mparser.ContinueNode): - self.append('continue') + self.append('continue', node) def visit_BreakNode(self, node: mparser.BreakNode): - self.append('break') + self.append('break', node) def visit_ArrayNode(self, node: mparser.ArrayNode): - self.append('[') - self.inc_indent() + self.append('[', node) node.args.accept(self) - self.dec_indent() - self.append(']') + self.append(']', node) def visit_DictNode(self, node: mparser.DictNode): - self.append('{') - self.inc_indent() + self.append('{', node) node.args.accept(self) - self.dec_indent() - self.append('}') + self.append('}', node) def visit_OrNode(self, node: mparser.OrNode): node.left.accept(self) - self.appendS('or') + self.appendS('or', node) node.right.accept(self) def visit_AndNode(self, node: mparser.AndNode): node.left.accept(self) - self.appendS('and') + self.appendS('and', node) node.right.accept(self) def visit_ComparisonNode(self, node: mparser.ComparisonNode): node.left.accept(self) - self.appendS(mparser.comparison_map[node.ctype]) + self.appendS(mparser.comparison_map[node.ctype], node) node.right.accept(self) def visit_ArithmeticNode(self, node: mparser.ArithmeticNode): node.left.accept(self) - self.appendS(arithmic_map[node.operation]) + self.appendS(arithmic_map[node.operation], node) node.right.accept(self) def visit_NotNode(self, node: mparser.NotNode): - self.appendS('not') + self.appendS('not', node) node.value.accept(self) def visit_CodeBlockNode(self, node: mparser.CodeBlockNode): @@ -118,75 +110,64 @@ class AstPrinter(AstVisitor): self.newline() def visit_IndexNode(self, node: mparser.IndexNode): - self.append('[') + self.append('[', node) node.index.accept(self) - self.append(']') + self.append(']', node) def visit_MethodNode(self, node: mparser.MethodNode): node.source_object.accept(self) - self.append('.' + node.name + '(') - self.inc_indent() + self.append('.' + node.name + '(', node) node.args.accept(self) - self.dec_indent() - self.append(')') + self.append(')', node) def visit_FunctionNode(self, node: mparser.FunctionNode): - self.append(node.func_name + '(') - self.inc_indent() + self.append(node.func_name + '(', node) node.args.accept(self) - self.dec_indent() - self.append(')') + self.append(')', node) def visit_AssignmentNode(self, node: mparser.AssignmentNode): - self.append(node.var_name + ' = ') + self.append(node.var_name + ' = ', node) node.value.accept(self) def visit_PlusAssignmentNode(self, node: mparser.PlusAssignmentNode): - self.append(node.var_name + ' += ') + 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] - self.appendS('foreach') - self.appendS(', '.join(varnames)) - self.appendS(':') + self.appendS('foreach', node) + self.appendS(', '.join(varnames), node) + self.appendS(':', node) node.items.accept(self) self.newline() - self.inc_indent() node.block.accept(self) - self.dec_indent() - self.append('endforeach') + self.append('endforeach', node) def visit_IfClauseNode(self, node: mparser.IfClauseNode): prefix = '' for i in node.ifs: - self.appendS(prefix + 'if') + self.appendS(prefix + 'if', node) prefix = 'el' i.accept(self) if node.elseblock: - self.append('else') - self.indent() - self.inc_indent() + self.append('else', node) node.elseblock.accept(self) - self.dec_indent() - self.append('endif') + self.append('endif', node) def visit_UMinusNode(self, node: mparser.UMinusNode): - self.appendS('-') + self.appendS('-', node) node.value.accept(self) def visit_IfNode(self, node: mparser.IfNode): node.condition.accept(self) self.newline() - self.inc_indent() node.block.accept(self) - self.dec_indent() def visit_TernaryNode(self, node: mparser.TernaryNode): node.condition.accept(self) - self.appendS('?') + self.appendS('?', node) node.trueblock.accept(self) - self.appendS(':') + self.appendS(':', node) node.falseblock.accept(self) def visit_ArgumentNode(self, node: mparser.ArgumentNode): @@ -198,13 +179,13 @@ class AstPrinter(AstVisitor): self.newline() for i in node.arguments: i.accept(self) - self.append(',') + self.append(',', node) if break_args: self.newline() for key, val in node.kwargs.items(): - self.append(key) - self.appendS(':') + self.append(key, node) + self.appendS(':', node) val.accept(self) - self.append(',') + self.append(',', node) if break_args: self.newline() -- cgit v1.1 From b7c6f3ec72c831c2af20eb5320d5f51b52d79227 Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Tue, 22 Jan 2019 16:00:10 +0100 Subject: Can now rewrite files --- mesonbuild/ast/printer.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'mesonbuild/ast/printer.py') diff --git a/mesonbuild/ast/printer.py b/mesonbuild/ast/printer.py index aab5a30..1f58146 100644 --- a/mesonbuild/ast/printer.py +++ b/mesonbuild/ast/printer.py @@ -17,6 +17,7 @@ from .. import mparser from . import AstVisitor +import re arithmic_map = { 'add': '+', @@ -33,11 +34,18 @@ class AstPrinter(AstVisitor): self.arg_newline_cutoff = arg_newline_cutoff self.ci = '' self.is_newline = True + self.last_level = 0 + + def post_process(self): + 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 if self.is_newline: self.result += ' ' * (level * self.indent) self.result += data @@ -179,13 +187,17 @@ class AstPrinter(AstVisitor): self.newline() for i in node.arguments: i.accept(self) - self.append(',', node) + self.append(', ', node) if break_args: self.newline() for key, val in node.kwargs.items(): self.append(key, node) self.appendS(':', node) val.accept(self) - self.append(',', node) + self.append(', ', node) if break_args: self.newline() + if break_args: + self.result = re.sub(r', \n$', '\n', self.result) + else: + self.result = re.sub(r', $', '', self.result) -- cgit v1.1 From dbb94f122ddeb5a37ff2603acbcc701b996958bb Mon Sep 17 00:00:00 2001 From: Daniel Mensinger Date: Thu, 24 Jan 2019 21:38:29 +0100 Subject: Fixed style issues --- mesonbuild/ast/printer.py | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'mesonbuild/ast/printer.py') diff --git a/mesonbuild/ast/printer.py b/mesonbuild/ast/printer.py index 1f58146..60e0b0d 100644 --- a/mesonbuild/ast/printer.py +++ b/mesonbuild/ast/printer.py @@ -51,7 +51,7 @@ class AstPrinter(AstVisitor): self.result += data self.is_newline = False - def appendS(self, data: str, node: mparser.BaseNode): + def append_padded(self, data: str, node: mparser.BaseNode): if self.result[-1] not in [' ', '\n']: data = ' ' + data self.append(data + ' ', node) @@ -90,26 +90,26 @@ class AstPrinter(AstVisitor): def visit_OrNode(self, node: mparser.OrNode): node.left.accept(self) - self.appendS('or', node) + self.append_padded('or', node) node.right.accept(self) def visit_AndNode(self, node: mparser.AndNode): node.left.accept(self) - self.appendS('and', node) + self.append_padded('and', node) node.right.accept(self) def visit_ComparisonNode(self, node: mparser.ComparisonNode): node.left.accept(self) - self.appendS(mparser.comparison_map[node.ctype], node) + self.append_padded(mparser.comparison_map[node.ctype], node) node.right.accept(self) def visit_ArithmeticNode(self, node: mparser.ArithmeticNode): node.left.accept(self) - self.appendS(arithmic_map[node.operation], node) + self.append_padded(arithmic_map[node.operation], node) node.right.accept(self) def visit_NotNode(self, node: mparser.NotNode): - self.appendS('not', node) + self.append_padded('not', node) node.value.accept(self) def visit_CodeBlockNode(self, node: mparser.CodeBlockNode): @@ -143,9 +143,9 @@ class AstPrinter(AstVisitor): def visit_ForeachClauseNode(self, node: mparser.ForeachClauseNode): varnames = [x.value for x in node.varnames] - self.appendS('foreach', node) - self.appendS(', '.join(varnames), node) - self.appendS(':', node) + self.append_padded('foreach', node) + self.append_padded(', '.join(varnames), node) + self.append_padded(':', node) node.items.accept(self) self.newline() node.block.accept(self) @@ -154,7 +154,7 @@ class AstPrinter(AstVisitor): def visit_IfClauseNode(self, node: mparser.IfClauseNode): prefix = '' for i in node.ifs: - self.appendS(prefix + 'if', node) + self.append_padded(prefix + 'if', node) prefix = 'el' i.accept(self) if node.elseblock: @@ -163,7 +163,7 @@ class AstPrinter(AstVisitor): self.append('endif', node) def visit_UMinusNode(self, node: mparser.UMinusNode): - self.appendS('-', node) + self.append_padded('-', node) node.value.accept(self) def visit_IfNode(self, node: mparser.IfNode): @@ -173,9 +173,9 @@ class AstPrinter(AstVisitor): def visit_TernaryNode(self, node: mparser.TernaryNode): node.condition.accept(self) - self.appendS('?', node) + self.append_padded('?', node) node.trueblock.accept(self) - self.appendS(':', node) + self.append_padded(':', node) node.falseblock.accept(self) def visit_ArgumentNode(self, node: mparser.ArgumentNode): @@ -192,7 +192,7 @@ class AstPrinter(AstVisitor): self.newline() for key, val in node.kwargs.items(): self.append(key, node) - self.appendS(':', node) + self.append_padded(':', node) val.accept(self) self.append(', ', node) if break_args: -- cgit v1.1