# HG changeset patch # User paulb@localhost.localdomain # Date 1182708256 -7200 # Node ID c35ea18cb33db211b79e4b7dcec0a84dd2fc1fb1 # Parent 4e91a493eee2106f75844cf8bc08c0ebc918821e Added "nowrap" presentation for all statements, preventing wrapping of text which would be illegal in actual source code. diff -r 4e91a493eee2 -r c35ea18cb33d simplify/viewer.py --- a/simplify/viewer.py Sun Jun 24 20:03:01 2007 +0200 +++ b/simplify/viewer.py Sun Jun 24 20:04:16 2007 +0200 @@ -47,6 +47,8 @@ background-color: black; color: white; } + .nowrap { white-space: nowrap; } + .class { margin-top: 1em; margin-bottom: 1em; } .function { margin-top: 1em; margin-bottom: 1em; } .body { padding-left: 2em; } @@ -290,7 +292,7 @@ # Statements. def visitAssert(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self.stream.write("\n") self._keyword("assert") self._popup( @@ -304,7 +306,7 @@ self.stream.write("
\n") def visitAssign(self, node): - self.stream.write("
\n") + self.stream.write("
\n") for lvalue in node.nodes: self.dispatch(lvalue) self.stream.write("=\n") @@ -312,7 +314,7 @@ self.stream.write("
\n") def visitAugAssign(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self.dispatch(node.node) self.stream.write("\n") self.stream.write("%s\n" % node.op) @@ -324,7 +326,7 @@ self.stream.write("
\n") def visitBreak(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self._keyword("break") self.stream.write("
\n") @@ -332,7 +334,7 @@ definition = node._node definitions = definition.active() structure = definition.expr.ref - self.stream.write("
\n" % structure.full_name()) + self.stream.write("
\n" % structure.full_name()) self.stream.write("
\n") self._keyword("class") self._name_start(structure.name, "class-name") @@ -363,24 +365,24 @@ self._comment(self._summary_link(self.module._node.name, structure.full_name())) self.stream.write("
\n") - self.stream.write("
\n") + self.stream.write("
\n") self._doc(node) self.dispatch(node.code) self.stream.write("
\n") self.stream.write("
\n") def visitContinue(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self._keyword("continue") self.stream.write("
\n") def visitDiscard(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self.default(node) self.stream.write("
\n") def visitFor(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self.stream.write("
\n") self.stream.write("\n") self._keyword("for") @@ -398,7 +400,7 @@ self.dispatch(node.list) self.stream.write(":\n") self.stream.write("
\n") - self.stream.write("
\n") + self.stream.write("
\n") self.dispatch(node.body) self.stream.write("
\n") if node.else_ is not None: @@ -406,13 +408,13 @@ self._keyword("else") self.stream.write(":\n") self.stream.write("
\n") - self.stream.write("
\n") + self.stream.write("
\n") self.dispatch(node.else_) self.stream.write("
\n") self.stream.write("
\n") def visitFrom(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self._keyword("from") self.stream.write("\n") self.stream.write(node.modname) @@ -442,7 +444,7 @@ definitions = [n for n in definition.active() if not isinstance(n, Subprogram)] subprogram = node._subprogram subprograms = subprogram.active() - self.stream.write("
\n" % subprogram.full_name()) + self.stream.write("
\n" % subprogram.full_name()) self.stream.write("
\n") self._keyword("def") self._name_start(subprogram.name, "function-name") @@ -458,14 +460,14 @@ self._comment(self._text(subprogram.full_name())) self.stream.write("
\n") - self.stream.write("
\n") + self.stream.write("
\n") self._doc(node) self.dispatch(node.code) self.stream.write("
\n") self.stream.write("
\n") def visitGlobal(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self._keyword("global") first = 1 for name in node.names: @@ -476,7 +478,7 @@ self.stream.write("
\n") def visitIf(self, node): - self.stream.write("
\n") + self.stream.write("
\n") first = 1 conditional = node._node conditionals = conditional.active() @@ -494,7 +496,7 @@ self.dispatch(compare) self.stream.write(":\n") self.stream.write("
\n") - self.stream.write("
\n") + self.stream.write("
\n") self.dispatch(stmt) self.stream.write("
\n") if conditional.else_: @@ -509,13 +511,13 @@ self._keyword("else") self.stream.write(":\n") self.stream.write("
\n") - self.stream.write("
\n") + self.stream.write("
\n") self.dispatch(node.else_) self.stream.write("
\n") self.stream.write("
\n") def visitImport(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self._keyword("import") first = 1 for (name, alias), _name in map(None, node.names, node._names): @@ -534,12 +536,12 @@ self.stream.write("
\n") def visitPass(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self._keyword("pass") self.stream.write("
\n") def visitPrint(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self._keyword("print") if node.dest is not None: self.stream.write(">>\n") @@ -550,7 +552,7 @@ self.stream.write("
\n") def visitPrintnl(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self._keyword("print") if node.dest is not None: self.stream.write(">>\n") @@ -566,7 +568,7 @@ def visitRaise(self, node): target = node._node.expr targets = target.active() - self.stream.write("
\n") + self.stream.write("
\n") self.stream.write("\n") self._keyword("raise") self._popup( @@ -585,7 +587,7 @@ def visitReturn(self, node): value = node._node values = value.active() - self.stream.write("
\n") + self.stream.write("
\n") self.stream.write("\n") self._keyword("return") self._popup( @@ -596,17 +598,17 @@ self.stream.write("
\n") def visitStmt(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self.default(node) self.stream.write("
\n") def visitTryExcept(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self.stream.write("
\n") self._keyword("try") self.stream.write(":\n") self.stream.write("
\n") - self.stream.write("
\n") + self.stream.write("
\n") self.dispatch(node.body) self.stream.write("
\n") for spec, assign, statement in node.handlers: @@ -619,7 +621,7 @@ self.dispatch(assign) self.stream.write(":\n") self.stream.write("
\n") - self.stream.write("
\n") + self.stream.write("
\n") self.dispatch(statement) self.stream.write("
\n") if node.else_ is not None: @@ -627,31 +629,31 @@ self._keyword("else") self.stream.write(":\n") self.stream.write("
\n") - self.stream.write("
\n") + self.stream.write("
\n") self.dispatch(node.else_) self.stream.write("
\n") self.stream.write("
\n") def visitTryFinally(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self.stream.write("
\n") self._keyword("try") self.stream.write(":\n") self.stream.write("
\n") - self.stream.write("
\n") + self.stream.write("
\n") self.dispatch(node.body) self.stream.write("
\n") self.stream.write("
\n") self._keyword("finally") self.stream.write(":\n") self.stream.write("
\n") - self.stream.write("
\n") + self.stream.write("
\n") self.dispatch(node.final) self.stream.write("
\n") self.stream.write("
\n") def visitWhile(self, node): - self.stream.write("
\n") + self.stream.write("
\n") self.stream.write("
\n") self.stream.write("\n") self._keyword("while") @@ -662,7 +664,7 @@ self.dispatch(node.test) self.stream.write(":\n") self.stream.write("
\n") - self.stream.write("
\n") + self.stream.write("
\n") self.dispatch(node.body) self.stream.write("
\n") if node.else_ is not None: @@ -670,7 +672,7 @@ self._keyword("else") self.stream.write(":\n") self.stream.write("
\n") - self.stream.write("
\n") + self.stream.write("
\n") self.dispatch(node.else_) self.stream.write("
\n") self.stream.write("
\n")