1.1 --- a/viewer.py Sun Oct 29 21:25:08 2006 +0100
1.2 +++ b/viewer.py Sun Oct 29 22:47:42 2006 +0100
1.3 @@ -337,7 +337,7 @@
1.4 self._popup_start()
1.5 self._invocations(conditional.test)
1.6 self._popup_end()
1.7 - self.stream.write("<span>\n")
1.8 + self.stream.write("</span>\n")
1.9 self.dispatch(compare)
1.10 self.stream.write(":\n")
1.11 self.stream.write("</div>\n")
1.12 @@ -440,7 +440,12 @@
1.13 def visitWhile(self, node):
1.14 self.stream.write("<div class='while'>\n")
1.15 self.stream.write("<div>\n")
1.16 + self.stream.write("<span class='conditional'>\n")
1.17 self._keyword("while")
1.18 + self._popup_start()
1.19 + self._invocations(node.test)
1.20 + self._popup_end()
1.21 + self.stream.write("</span>\n")
1.22 self.dispatch(node.test)
1.23 self.stream.write(":\n")
1.24 self.stream.write("</div>\n")
1.25 @@ -706,9 +711,10 @@
1.26 fn = invocation.full_name()
1.27 module = invocation.module.name
1.28 name = invocation.name
1.29 + structures = [x.name for x in invocation.structures]
1.30 self.stream.write("<div class='invocation'>")
1.31 self.stream.write("<a href='%s.html#%s'>" % (self._url(module), self._url(fn)))
1.32 - self.stream.write("%s.%s" % (self._text(module), self._text(name)))
1.33 + self.stream.write(self._text(".".join([module] + structures + [name])))
1.34 self.stream.write("</a>")
1.35 self.stream.write("</div>\n")
1.36 self.stream.write("</div>\n")