1.1 --- a/simplify/viewer.py Tue Jun 12 00:35:23 2007 +0200
1.2 +++ b/simplify/viewer.py Sat Jun 16 01:57:38 2007 +0200
1.3 @@ -85,9 +85,9 @@
1.4 float: left;
1.5 }
1.6
1.7 - .non-writes, .non-accesses {
1.8 + .non-scopes {
1.9 padding: 0.5em; background-color: #FF0000;
1.10 - float: right;
1.11 + float: left;
1.12 }
1.13
1.14 .no-types {
1.15 @@ -1246,6 +1246,7 @@
1.16 "Output the scope information for the given simplified 'nodes'."
1.17
1.18 labels = {}
1.19 + non_labels = {}
1.20 for node in nodes:
1.21
1.22 # Straightforward name loading/storing involves the local scope.
1.23 @@ -1280,15 +1281,24 @@
1.24 # Non-loading...
1.25
1.26 if hasattr(node, "non_accesses") and node.non_accesses:
1.27 - self._types_container(node.non_accesses, "non-accesses")
1.28 + for attr in node.non_accesses:
1.29 + fn = attr.type.full_name()
1.30 + non_labels[self._text(fn)] = None
1.31
1.32 # Non-storing...
1.33
1.34 if hasattr(node, "non_writes") and node.non_writes:
1.35 - self._types_container(node.non_writes, "non-writes")
1.36 + for attr in node.non_writes:
1.37 + fn = attr.type.full_name()
1.38 + non_labels[self._text(fn)] = None
1.39
1.40 if labels:
1.41 - return [("scopes", "scope", labels.keys())]
1.42 + spec = []
1.43 + if labels:
1.44 + spec.append(("scopes", "scope", labels.keys()))
1.45 + if non_labels:
1.46 + spec.append(("non-scopes", "scope", non_labels.keys()))
1.47 + return spec
1.48 else:
1.49 return []
1.50