1.1 --- a/simplify/viewer.py Sun Jun 24 20:03:01 2007 +0200
1.2 +++ b/simplify/viewer.py Sun Jun 24 20:04:16 2007 +0200
1.3 @@ -47,6 +47,8 @@
1.4 background-color: black; color: white;
1.5 }
1.6
1.7 + .nowrap { white-space: nowrap; }
1.8 +
1.9 .class { margin-top: 1em; margin-bottom: 1em; }
1.10 .function { margin-top: 1em; margin-bottom: 1em; }
1.11 .body { padding-left: 2em; }
1.12 @@ -290,7 +292,7 @@
1.13 # Statements.
1.14
1.15 def visitAssert(self, node):
1.16 - self.stream.write("<div class='assert'>\n")
1.17 + self.stream.write("<div class='assert nowrap'>\n")
1.18 self.stream.write("<span class='failure'>\n")
1.19 self._keyword("assert")
1.20 self._popup(
1.21 @@ -304,7 +306,7 @@
1.22 self.stream.write("</div>\n")
1.23
1.24 def visitAssign(self, node):
1.25 - self.stream.write("<div class='assign'>\n")
1.26 + self.stream.write("<div class='assign nowrap'>\n")
1.27 for lvalue in node.nodes:
1.28 self.dispatch(lvalue)
1.29 self.stream.write("=\n")
1.30 @@ -312,7 +314,7 @@
1.31 self.stream.write("</div>\n")
1.32
1.33 def visitAugAssign(self, node):
1.34 - self.stream.write("<div class='augassign'>\n")
1.35 + self.stream.write("<div class='augassign nowrap'>\n")
1.36 self.dispatch(node.node)
1.37 self.stream.write("<span class='operator'>\n")
1.38 self.stream.write("%s\n" % node.op)
1.39 @@ -324,7 +326,7 @@
1.40 self.stream.write("</div>\n")
1.41
1.42 def visitBreak(self, node):
1.43 - self.stream.write("<div class='break'>\n")
1.44 + self.stream.write("<div class='break nowrap'>\n")
1.45 self._keyword("break")
1.46 self.stream.write("</div>\n")
1.47
1.48 @@ -332,7 +334,7 @@
1.49 definition = node._node
1.50 definitions = definition.active()
1.51 structure = definition.expr.ref
1.52 - self.stream.write("<div class='class' id='%s'>\n" % structure.full_name())
1.53 + self.stream.write("<div class='class nowrap' id='%s'>\n" % structure.full_name())
1.54 self.stream.write("<div>\n")
1.55 self._keyword("class")
1.56 self._name_start(structure.name, "class-name")
1.57 @@ -363,24 +365,24 @@
1.58 self._comment(self._summary_link(self.module._node.name, structure.full_name()))
1.59 self.stream.write("</div>\n")
1.60
1.61 - self.stream.write("<div class='body'>\n")
1.62 + self.stream.write("<div class='body nowrap'>\n")
1.63 self._doc(node)
1.64 self.dispatch(node.code)
1.65 self.stream.write("</div>\n")
1.66 self.stream.write("</div>\n")
1.67
1.68 def visitContinue(self, node):
1.69 - self.stream.write("<div class='continue'>\n")
1.70 + self.stream.write("<div class='continue nowrap'>\n")
1.71 self._keyword("continue")
1.72 self.stream.write("</div>\n")
1.73
1.74 def visitDiscard(self, node):
1.75 - self.stream.write("<div class='discard'>\n")
1.76 + self.stream.write("<div class='discard nowrap'>\n")
1.77 self.default(node)
1.78 self.stream.write("</div>\n")
1.79
1.80 def visitFor(self, node):
1.81 - self.stream.write("<div class='if'>\n")
1.82 + self.stream.write("<div class='if nowrap'>\n")
1.83 self.stream.write("<div>\n")
1.84 self.stream.write("<span class='iterator'>\n")
1.85 self._keyword("for")
1.86 @@ -398,7 +400,7 @@
1.87 self.dispatch(node.list)
1.88 self.stream.write(":\n")
1.89 self.stream.write("</div>\n")
1.90 - self.stream.write("<div class='body'>\n")
1.91 + self.stream.write("<div class='body nowrap'>\n")
1.92 self.dispatch(node.body)
1.93 self.stream.write("</div>\n")
1.94 if node.else_ is not None:
1.95 @@ -406,13 +408,13 @@
1.96 self._keyword("else")
1.97 self.stream.write(":\n")
1.98 self.stream.write("</div>\n")
1.99 - self.stream.write("<div class='body'>\n")
1.100 + self.stream.write("<div class='body nowrap'>\n")
1.101 self.dispatch(node.else_)
1.102 self.stream.write("</div>\n")
1.103 self.stream.write("</div>\n")
1.104
1.105 def visitFrom(self, node):
1.106 - self.stream.write("<div class='from'>\n")
1.107 + self.stream.write("<div class='from nowrap'>\n")
1.108 self._keyword("from")
1.109 self.stream.write("<span class='name'>\n")
1.110 self.stream.write(node.modname)
1.111 @@ -442,7 +444,7 @@
1.112 definitions = [n for n in definition.active() if not isinstance(n, Subprogram)]
1.113 subprogram = node._subprogram
1.114 subprograms = subprogram.active()
1.115 - self.stream.write("<div class='function' id='%s'>\n" % subprogram.full_name())
1.116 + self.stream.write("<div class='function nowrap' id='%s'>\n" % subprogram.full_name())
1.117 self.stream.write("<div>\n")
1.118 self._keyword("def")
1.119 self._name_start(subprogram.name, "function-name")
1.120 @@ -458,14 +460,14 @@
1.121 self._comment(self._text(subprogram.full_name()))
1.122 self.stream.write("</div>\n")
1.123
1.124 - self.stream.write("<div class='body'>\n")
1.125 + self.stream.write("<div class='body nowrap'>\n")
1.126 self._doc(node)
1.127 self.dispatch(node.code)
1.128 self.stream.write("</div>\n")
1.129 self.stream.write("</div>\n")
1.130
1.131 def visitGlobal(self, node):
1.132 - self.stream.write("<div class='global'>\n")
1.133 + self.stream.write("<div class='global nowrap'>\n")
1.134 self._keyword("global")
1.135 first = 1
1.136 for name in node.names:
1.137 @@ -476,7 +478,7 @@
1.138 self.stream.write("</div>\n")
1.139
1.140 def visitIf(self, node):
1.141 - self.stream.write("<div class='if'>\n")
1.142 + self.stream.write("<div class='if nowrap'>\n")
1.143 first = 1
1.144 conditional = node._node
1.145 conditionals = conditional.active()
1.146 @@ -494,7 +496,7 @@
1.147 self.dispatch(compare)
1.148 self.stream.write(":\n")
1.149 self.stream.write("</div>\n")
1.150 - self.stream.write("<div class='body'>\n")
1.151 + self.stream.write("<div class='body nowrap'>\n")
1.152 self.dispatch(stmt)
1.153 self.stream.write("</div>\n")
1.154 if conditional.else_:
1.155 @@ -509,13 +511,13 @@
1.156 self._keyword("else")
1.157 self.stream.write(":\n")
1.158 self.stream.write("</div>\n")
1.159 - self.stream.write("<div class='body'>\n")
1.160 + self.stream.write("<div class='body nowrap'>\n")
1.161 self.dispatch(node.else_)
1.162 self.stream.write("</div>\n")
1.163 self.stream.write("</div>\n")
1.164
1.165 def visitImport(self, node):
1.166 - self.stream.write("<div class='import'>\n")
1.167 + self.stream.write("<div class='import nowrap'>\n")
1.168 self._keyword("import")
1.169 first = 1
1.170 for (name, alias), _name in map(None, node.names, node._names):
1.171 @@ -534,12 +536,12 @@
1.172 self.stream.write("</div>\n")
1.173
1.174 def visitPass(self, node):
1.175 - self.stream.write("<div class='pass'>\n")
1.176 + self.stream.write("<div class='pass nowrap'>\n")
1.177 self._keyword("pass")
1.178 self.stream.write("</div>\n")
1.179
1.180 def visitPrint(self, node):
1.181 - self.stream.write("<div class='print'>\n")
1.182 + self.stream.write("<div class='print nowrap'>\n")
1.183 self._keyword("print")
1.184 if node.dest is not None:
1.185 self.stream.write(">>\n")
1.186 @@ -550,7 +552,7 @@
1.187 self.stream.write("</div>\n")
1.188
1.189 def visitPrintnl(self, node):
1.190 - self.stream.write("<div class='printnl'>\n")
1.191 + self.stream.write("<div class='printnl nowrap'>\n")
1.192 self._keyword("print")
1.193 if node.dest is not None:
1.194 self.stream.write(">>\n")
1.195 @@ -566,7 +568,7 @@
1.196 def visitRaise(self, node):
1.197 target = node._node.expr
1.198 targets = target.active()
1.199 - self.stream.write("<div class='raise'>\n")
1.200 + self.stream.write("<div class='raise nowrap'>\n")
1.201 self.stream.write("<span class='call'>\n")
1.202 self._keyword("raise")
1.203 self._popup(
1.204 @@ -585,7 +587,7 @@
1.205 def visitReturn(self, node):
1.206 value = node._node
1.207 values = value.active()
1.208 - self.stream.write("<div class='return'>\n")
1.209 + self.stream.write("<div class='return nowrap'>\n")
1.210 self.stream.write("<span class='returns'>\n")
1.211 self._keyword("return")
1.212 self._popup(
1.213 @@ -596,17 +598,17 @@
1.214 self.stream.write("</div>\n")
1.215
1.216 def visitStmt(self, node):
1.217 - self.stream.write("<div class='stmt'>\n")
1.218 + self.stream.write("<div class='stmt nowrap'>\n")
1.219 self.default(node)
1.220 self.stream.write("</div>\n")
1.221
1.222 def visitTryExcept(self, node):
1.223 - self.stream.write("<div class='tryexcept'>\n")
1.224 + self.stream.write("<div class='tryexcept nowrap'>\n")
1.225 self.stream.write("<div>\n")
1.226 self._keyword("try")
1.227 self.stream.write(":\n")
1.228 self.stream.write("</div>\n")
1.229 - self.stream.write("<div class='body'>\n")
1.230 + self.stream.write("<div class='body nowrap'>\n")
1.231 self.dispatch(node.body)
1.232 self.stream.write("</div>\n")
1.233 for spec, assign, statement in node.handlers:
1.234 @@ -619,7 +621,7 @@
1.235 self.dispatch(assign)
1.236 self.stream.write(":\n")
1.237 self.stream.write("</div>\n")
1.238 - self.stream.write("<div class='body'>\n")
1.239 + self.stream.write("<div class='body nowrap'>\n")
1.240 self.dispatch(statement)
1.241 self.stream.write("</div>\n")
1.242 if node.else_ is not None:
1.243 @@ -627,31 +629,31 @@
1.244 self._keyword("else")
1.245 self.stream.write(":\n")
1.246 self.stream.write("</div>\n")
1.247 - self.stream.write("<div class='body'>\n")
1.248 + self.stream.write("<div class='body nowrap'>\n")
1.249 self.dispatch(node.else_)
1.250 self.stream.write("</div>\n")
1.251 self.stream.write("</div>\n")
1.252
1.253 def visitTryFinally(self, node):
1.254 - self.stream.write("<div class='tryfinally'>\n")
1.255 + self.stream.write("<div class='tryfinally nowrap'>\n")
1.256 self.stream.write("<div>\n")
1.257 self._keyword("try")
1.258 self.stream.write(":\n")
1.259 self.stream.write("</div>\n")
1.260 - self.stream.write("<div class='body'>\n")
1.261 + self.stream.write("<div class='body nowrap'>\n")
1.262 self.dispatch(node.body)
1.263 self.stream.write("</div>\n")
1.264 self.stream.write("<div>\n")
1.265 self._keyword("finally")
1.266 self.stream.write(":\n")
1.267 self.stream.write("</div>\n")
1.268 - self.stream.write("<div class='body'>\n")
1.269 + self.stream.write("<div class='body nowrap'>\n")
1.270 self.dispatch(node.final)
1.271 self.stream.write("</div>\n")
1.272 self.stream.write("</div>\n")
1.273
1.274 def visitWhile(self, node):
1.275 - self.stream.write("<div class='while'>\n")
1.276 + self.stream.write("<div class='while nowrap'>\n")
1.277 self.stream.write("<div>\n")
1.278 self.stream.write("<span class='conditional'>\n")
1.279 self._keyword("while")
1.280 @@ -662,7 +664,7 @@
1.281 self.dispatch(node.test)
1.282 self.stream.write(":\n")
1.283 self.stream.write("</div>\n")
1.284 - self.stream.write("<div class='body'>\n")
1.285 + self.stream.write("<div class='body nowrap'>\n")
1.286 self.dispatch(node.body)
1.287 self.stream.write("</div>\n")
1.288 if node.else_ is not None:
1.289 @@ -670,7 +672,7 @@
1.290 self._keyword("else")
1.291 self.stream.write(":\n")
1.292 self.stream.write("</div>\n")
1.293 - self.stream.write("<div class='body'>\n")
1.294 + self.stream.write("<div class='body nowrap'>\n")
1.295 self.dispatch(node.else_)
1.296 self.stream.write("</div>\n")
1.297 self.stream.write("</div>\n")