1.1 --- a/moinformat/tree/moin.py Fri Jun 30 00:37:36 2023 +0200
1.2 +++ b/moinformat/tree/moin.py Fri Jun 30 00:40:39 2023 +0200
1.3 @@ -175,14 +175,6 @@
1.4
1.5 return not self.text_content().strip()
1.6
1.7 - def __str__(self):
1.8 - return self.prettyprint()
1.9 -
1.10 - def _prettyprint(self, l, indent=""):
1.11 - for node in self.nodes:
1.12 - l.append(node.prettyprint(indent + " "))
1.13 - return "\n".join(l)
1.14 -
1.15 class Region(Container):
1.16
1.17 "A region of the page."
1.18 @@ -213,11 +205,6 @@
1.19 return "Region(%r, %r, %r, %r, %r, %r, %r)" % (self.nodes, self.level,
1.20 self.indent, self.type, self.args, self.transparent, self.extra)
1.21
1.22 - def prettyprint(self, indent=""):
1.23 - l = ["%sRegion: level=%d indent=%d type=%s args=%r extra=%r" % (indent,
1.24 - self.level, self.indent, self.type, self.args, self.extra)]
1.25 - return self._prettyprint(l, indent)
1.26 -
1.27 def visit(self, visitor):
1.28 visitor.region(self)
1.29
1.30 @@ -232,10 +219,6 @@
1.31 def __repr__(self):
1.32 return "Block(%r)" % self.nodes
1.33
1.34 - def prettyprint(self, indent=""):
1.35 - l = ["%sBlock" % indent]
1.36 - return self._prettyprint(l, indent)
1.37 -
1.38 def visit(self, visitor):
1.39 visitor.block(self)
1.40
1.41 @@ -251,10 +234,6 @@
1.42 def __repr__(self):
1.43 return "DefItem(%r, %r, %r)" % (self.nodes, self.pad, self.extra)
1.44
1.45 - def prettyprint(self, indent=""):
1.46 - l = ["%sDefItem: pad=%r extra=%r" % (indent, self.pad, self.extra)]
1.47 - return self._prettyprint(l, indent)
1.48 -
1.49 def visit(self, visitor):
1.50 visitor.defitem(self)
1.51
1.52 @@ -270,10 +249,6 @@
1.53 def __repr__(self):
1.54 return "DefTerm(%r, %r, %r)" % (self.nodes, self.pad, self.extra)
1.55
1.56 - def prettyprint(self, indent=""):
1.57 - l = ["%sDefTerm: pad=%r extra=%r" % (indent, self.pad, self.extra)]
1.58 - return self._prettyprint(l, indent)
1.59 -
1.60 def visit(self, visitor):
1.61 visitor.defterm(self)
1.62
1.63 @@ -303,10 +278,6 @@
1.64 def __repr__(self):
1.65 return "FontStyle(%r, %r, %r)" % (self.nodes, self.emphasis, self.strong)
1.66
1.67 - def prettyprint(self, indent=""):
1.68 - l = ["%sFontStyle: emphasis=%r strong=%r" % (indent, self.emphasis, self.strong)]
1.69 - return self._prettyprint(l, indent)
1.70 -
1.71 def visit(self, visitor):
1.72 visitor.fontstyle(self)
1.73
1.74 @@ -329,13 +300,6 @@
1.75 self.nodes, self.level, self.start_extra, self.start_pad,
1.76 self.end_pad, self.end_extra, self.identifier)
1.77
1.78 - def prettyprint(self, indent=""):
1.79 - l = ["%sHeading: level=%d start_extra=%r start_pad=%r end_pad=%r"
1.80 - " end_extra=%r identifier=%r" % (
1.81 - indent, self.level, self.start_extra, self.start_pad, self.end_pad,
1.82 - self.end_extra, self.identifier)]
1.83 - return self._prettyprint(l, indent)
1.84 -
1.85 def visit(self, visitor):
1.86 visitor.heading(self)
1.87
1.88 @@ -346,10 +310,6 @@
1.89 def __repr__(self):
1.90 return "LinkLabel(%r)" % self.nodes
1.91
1.92 - def prettyprint(self, indent=""):
1.93 - l = ["%sLinkLabel" % indent]
1.94 - return self._prettyprint(l, indent)
1.95 -
1.96 def visit(self, visitor):
1.97 visitor.link_label(self)
1.98
1.99 @@ -360,10 +320,6 @@
1.100 def __repr__(self):
1.101 return "LinkParameter(%r)" % self.nodes
1.102
1.103 - def prettyprint(self, indent=""):
1.104 - l = ["%sLinkParameter" % indent]
1.105 - return self._prettyprint(l, indent)
1.106 -
1.107 def visit(self, visitor):
1.108 visitor.link_parameter(self)
1.109
1.110 @@ -384,12 +340,6 @@
1.111 def __repr__(self):
1.112 return "List(%r)" % self.nodes
1.113
1.114 - def prettyprint(self, indent=""):
1.115 - if not self.first:
1.116 - self.init()
1.117 - l = ["%sList: indent=%r marker=%r num=%r" % (indent, self.indent, self.marker, self.num)]
1.118 - return self._prettyprint(l, indent)
1.119 -
1.120 def visit(self, visitor):
1.121 if not self.first:
1.122 self.init()
1.123 @@ -413,12 +363,18 @@
1.124 def __repr__(self):
1.125 return "ListItem(%r, %r, %r, %r, %r)" % (self.nodes, self.indent, self.marker, self.space, self.num)
1.126
1.127 - def prettyprint(self, indent=""):
1.128 - l = ["%sListItem: indent=%d marker=%r space=%r num=%r" % (indent, self.indent, self.marker, self.space, self.num)]
1.129 - return self._prettyprint(l, indent)
1.130 + def visit(self, visitor):
1.131 + visitor.listitem(self)
1.132 +
1.133 +class Table(Container):
1.134 +
1.135 + "A table."
1.136 +
1.137 + def __repr__(self):
1.138 + return "Table(%r)" % self.nodes
1.139
1.140 def visit(self, visitor):
1.141 - visitor.listitem(self)
1.142 + visitor.table(self)
1.143
1.144 class TableAttrs(Container):
1.145
1.146 @@ -436,27 +392,9 @@
1.147 def __repr__(self):
1.148 return "TableAttrs(%r)" % self.nodes
1.149
1.150 - def prettyprint(self, indent=""):
1.151 - l = ["%sTableAttrs:" % indent]
1.152 - return self._prettyprint(l, indent)
1.153 -
1.154 def visit(self, visitor):
1.155 visitor.table_attrs(self)
1.156
1.157 -class Table(Container):
1.158 -
1.159 - "A table."
1.160 -
1.161 - def __repr__(self):
1.162 - return "Table(%r)" % self.nodes
1.163 -
1.164 - def prettyprint(self, indent=""):
1.165 - l = ["%sTable:" % indent]
1.166 - return self._prettyprint(l, indent)
1.167 -
1.168 - def visit(self, visitor):
1.169 - visitor.table(self)
1.170 -
1.171 class TableCell(Container):
1.172
1.173 "A table cell."
1.174 @@ -471,11 +409,6 @@
1.175 return "TableCell(%r, %r, %r, %r)" % (self.nodes, self.attrs,
1.176 self.leading, self.padding)
1.177
1.178 - def prettyprint(self, indent=""):
1.179 - l = ["%sTableCell: leading=%r padding=%r" % (indent, self.leading,
1.180 - self.padding)]
1.181 - return self._prettyprint(l, indent)
1.182 -
1.183 def visit(self, visitor):
1.184 visitor.table_cell(self)
1.185
1.186 @@ -493,11 +426,6 @@
1.187 return "TableRow(%r, %r, %r, %r)" % (self.nodes, self.trailing,
1.188 self.leading, self.padding)
1.189
1.190 - def prettyprint(self, indent=""):
1.191 - l = ["%sTableRow: trailing=%r leading=%r padding=%r" % (
1.192 - indent, self.trailing, self.leading, self.padding)]
1.193 - return self._prettyprint(l, indent)
1.194 -
1.195 def visit(self, visitor):
1.196 visitor.table_row(self)
1.197
1.198 @@ -512,10 +440,6 @@
1.199 def __repr__(self):
1.200 return "%s(%r)" % (self.__class__.__name__, self.nodes)
1.201
1.202 - def prettyprint(self, indent=""):
1.203 - l = ["%s%s" % (indent, self.__class__.__name__)]
1.204 - return self._prettyprint(l, indent)
1.205 -
1.206 class Larger(Inline):
1.207
1.208 "Larger text."
1.209 @@ -534,10 +458,6 @@
1.210 def __repr__(self):
1.211 return "Link(%r, %r)" % (self.nodes, self.target)
1.212
1.213 - def prettyprint(self, indent=""):
1.214 - l = ["%sLink: target=%r" % (indent, self.target)]
1.215 - return self._prettyprint(l, indent)
1.216 -
1.217 def visit(self, visitor):
1.218 visitor.link(self)
1.219
1.220 @@ -558,10 +478,6 @@
1.221 self.parent, self.region,
1.222 self.nodes, self.inline)
1.223
1.224 - def prettyprint(self, indent=""):
1.225 - l = ["%sMacro: name=%r args=%r" % (indent, self.name, self.args)]
1.226 - return self._prettyprint(l, indent)
1.227 -
1.228 def visit(self, visitor):
1.229 visitor.macro(self)
1.230
1.231 @@ -611,10 +527,6 @@
1.232 def __repr__(self):
1.233 return "Transclusion(%r, %r)" % (self.nodes, self.target)
1.234
1.235 - def prettyprint(self, indent=""):
1.236 - l = ["%sTransclusion: target=%r" % (indent, self.target)]
1.237 - return self._prettyprint(l, indent)
1.238 -
1.239 def visit(self, visitor):
1.240 visitor.transclusion(self)
1.241
1.242 @@ -646,9 +558,6 @@
1.243 def __repr__(self):
1.244 return "Anchor(%r)" % self.target
1.245
1.246 - def prettyprint(self, indent=""):
1.247 - return "%sAnchor: target=%r" % (indent, self.target)
1.248 -
1.249 def visit(self, visitor):
1.250 visitor.anchor(self)
1.251
1.252 @@ -659,9 +568,6 @@
1.253 def __repr__(self):
1.254 return "Break()"
1.255
1.256 - def prettyprint(self, indent=""):
1.257 - return "%sBreak" % indent
1.258 -
1.259 def visit(self, visitor):
1.260 visitor.break_(self)
1.261
1.262 @@ -676,9 +582,6 @@
1.263 def __repr__(self):
1.264 return "Comment(%r, %r)" % (self.comment, self.extra)
1.265
1.266 - def prettyprint(self, indent=""):
1.267 - return "%sComment: comment=%r extra=%r" % (indent, self.comment, self.extra)
1.268 -
1.269 def visit(self, visitor):
1.270 visitor.comment(self)
1.271
1.272 @@ -693,9 +596,6 @@
1.273 def __repr__(self):
1.274 return "Directive(%r, %r)" % (self.directive, self.extra)
1.275
1.276 - def prettyprint(self, indent=""):
1.277 - return "%sDirective: directive=%r extra=%r" % (indent, self.directive, self.extra)
1.278 -
1.279 def visit(self, visitor):
1.280 visitor.directive(self)
1.281
1.282 @@ -706,9 +606,6 @@
1.283 def __repr__(self):
1.284 return "LineBreak()"
1.285
1.286 - def prettyprint(self, indent=""):
1.287 - return "%sLineBreak" % indent
1.288 -
1.289 def visit(self, visitor):
1.290 visitor.linebreak(self)
1.291
1.292 @@ -719,9 +616,6 @@
1.293 def __repr__(self):
1.294 return "NonBreakingSpace()"
1.295
1.296 - def prettyprint(self, indent=""):
1.297 - return "%sNonBreakingSpace" % indent
1.298 -
1.299 def visit(self, visitor):
1.300 visitor.nbsp(self)
1.301
1.302 @@ -735,9 +629,6 @@
1.303 def __repr__(self):
1.304 return "Rule(%d)" % self.height
1.305
1.306 - def prettyprint(self, indent=""):
1.307 - return "%sRule: height=%d" % (indent, self.height)
1.308 -
1.309 def visit(self, visitor):
1.310 visitor.rule(self)
1.311
1.312 @@ -754,9 +645,6 @@
1.313 def __repr__(self):
1.314 return "TableAttr(%r, %r, %r, %r)" % (self.name, self.value, self.concise, self.quote)
1.315
1.316 - def prettyprint(self, indent=""):
1.317 - return "%sTableAttr: name=%r value=%r concise=%r quote=%r" % (indent, self.name, self.value, self.concise, self.quote)
1.318 -
1.319 def visit(self, visitor):
1.320 visitor.table_attr(self)
1.321
1.322 @@ -779,9 +667,6 @@
1.323 def __repr__(self):
1.324 return "Text(%r)" % self.s
1.325
1.326 - def prettyprint(self, indent=""):
1.327 - return "%sText: %r" % (indent, self.s)
1.328 -
1.329 def visit(self, visitor):
1.330 visitor.text(self)
1.331
1.332 @@ -795,9 +680,6 @@
1.333 def __repr__(self):
1.334 return "Verbatim(%r)" % self.text
1.335
1.336 - def prettyprint(self, indent=""):
1.337 - return "%sVerbatim: text=%r" % (indent, self.text)
1.338 -
1.339 def visit(self, visitor):
1.340 visitor.verbatim(self)
1.341