1.1 --- a/micropython/report.py Sun Jun 26 17:01:29 2011 +0200
1.2 +++ b/micropython/report.py Sun Jun 26 23:54:37 2011 +0200
1.3 @@ -236,7 +236,10 @@
1.4 can be used to customise the CSS classes employed.
1.5 """
1.6
1.7 - self._summary_link(module.full_name(), obj.full_name(), obj.name, classes)
1.8 + if isinstance(obj, Class) or (isinstance(obj, Function) and obj.is_method()):
1.9 + self._summary_link(module.full_name(), obj.full_name(), obj.name, classes)
1.10 + else:
1.11 + self._span(obj.name, classes)
1.12
1.13 def _object_name_ref(self, module, obj, name=None, classes=None):
1.14
1.15 @@ -268,7 +271,7 @@
1.16 def _op(self, symbol, name=None, leading=0, trailing=1):
1.17 if leading:
1.18 self.stream.write(" ")
1.19 - self._span_start("operation")
1.20 + self._span_start(name and "operation" or None)
1.21 self._span(symbol, "operator")
1.22 if name is not None:
1.23 self._popup_start()
1.24 @@ -834,7 +837,7 @@
1.25 self._accessor_end(target_names)
1.26 self._span_start("attr")
1.27 self.stream.write(".")
1.28 - self._name(node.attrname)
1.29 + self._span(node.attrname, "attrname")
1.30 self._span_end()
1.31 self._span_end()
1.32
1.33 @@ -858,6 +861,12 @@
1.34 def visitBitand(self, node):
1.35 self._visitBitBinary(node, "bitand", "&")
1.36
1.37 + def visitBitor(self, node):
1.38 + self._visitBitBinary(node, "bitor", "|")
1.39 +
1.40 + def visitBitxor(self, node):
1.41 + self._visitBitBinary(node, "bitxor", "^")
1.42 +
1.43 def visitCallFunc(self, node):
1.44 self._span_start("callfunc")
1.45 self.dispatch(node.node)