1.1 --- a/micropython/data.py Tue Apr 24 23:51:15 2012 +0200
1.2 +++ b/micropython/data.py Tue May 01 01:46:59 2012 +0200
1.3 @@ -1109,15 +1109,17 @@
1.4 return 0
1.5
1.6 def __repr__(self):
1.7 - return "Attr(%r, %s, %r) # {[%s] (%r)}" % (
1.8 - self.position, shortrepr(self.parent), self.name,
1.9 - self._context_values_str(), self.assignments
1.10 + if self.position is not None:
1.11 + position = "at %r, " % self.position
1.12 + else:
1.13 + position = ""
1.14 + return "<%s.%s (%sassigned %r)>" % (
1.15 + shortrepr(self.parent), self.name,
1.16 + position, self.assignments
1.17 )
1.18
1.19 def __shortrepr__(self):
1.20 - return "Attr(%r, %s, %r)" % (
1.21 - self.position, shortrepr(self.parent), self.name
1.22 - )
1.23 + return "%s.%s (at %r)" % (shortrepr(self.parent), self.name, self.position)
1.24
1.25 def _context_values_str(self):
1.26 l = []
1.27 @@ -1140,7 +1142,7 @@
1.28 self.location = None
1.29
1.30 def __repr__(self):
1.31 - return "Instance()"
1.32 + return "<instance>"
1.33
1.34 def __eq__(self, other):
1.35 return other.__class__ is Instance
1.36 @@ -1276,12 +1278,12 @@
1.37
1.38 def __repr__(self):
1.39 if self.location is not None:
1.40 - return "Class(%r, %s, location=%r)" % (self.name, shortrepr(self.parent), self.location)
1.41 + return "<class %s (at %r)>" % (shortrepr(self), self.location)
1.42 else:
1.43 - return "Class(%r, %s)" % (self.name, shortrepr(self.parent))
1.44 + return "<class %s>" % shortrepr(self)
1.45
1.46 def __shortrepr__(self):
1.47 - return "Class(%r, %s)" % (self.name, shortrepr(self.parent))
1.48 + return "%s.%s" % (shortrepr(self.parent), self.name)
1.49
1.50 def get_body_block(self):
1.51 return self.get_instantiator().blocks[0]
1.52 @@ -1722,18 +1724,14 @@
1.53
1.54 def __repr__(self):
1.55 if self.location is not None:
1.56 - return "Function(%r, %s, %r, location=%r, code_location=%r)" % (
1.57 - self.name, shortrepr(self.parent), self.argnames, self.location, self.code_location
1.58 + return "<function %s (at %r, code at %r)>" % (
1.59 + shortrepr(self), self.location, self.code_location
1.60 )
1.61 else:
1.62 - return "Function(%r, %s, %r)" % (
1.63 - self.name, shortrepr(self.parent), self.argnames
1.64 - )
1.65 + return "<function %s>" % shortrepr(self)
1.66
1.67 def __shortrepr__(self):
1.68 - return "Function(%r, %s)" % (
1.69 - self.name, shortrepr(self.parent)
1.70 - )
1.71 + return "%s.%s(%s)" % (shortrepr(self.parent), self.name, ", ".join(self.argnames))
1.72
1.73 def get_body_block(self):
1.74 return self.body_block
1.75 @@ -1955,9 +1953,10 @@
1.76 all_class_attribute_names = class_attribute_names = instance_attribute_names = all_attribute_names
1.77
1.78 def __repr__(self):
1.79 - return "UnresolvedName(%r, %r)" % (self.name, self.parent_name)
1.80 -
1.81 - __shortrepr__ = __repr__
1.82 + return "<unknown %s>" % shortrepr(self)
1.83 +
1.84 + def __shortrepr__(self):
1.85 + return "%s.%s" % (self.parent_name, self.name)
1.86
1.87 def full_name(self):
1.88 if self.name is not None:
1.89 @@ -2004,12 +2003,12 @@
1.90
1.91 def __repr__(self):
1.92 if self.location is not None:
1.93 - return "Module(%r, location=%r)" % (self.name, self.location)
1.94 + return "<module %s (at %r)>" % (self.name, self.location)
1.95 else:
1.96 - return "Module(%r)" % self.name
1.97 + return "<module %s>" % shortrepr(self)
1.98
1.99 def __shortrepr__(self):
1.100 - return "Module(%r)" % self.name
1.101 + return self.name
1.102
1.103 # Attribute methods.
1.104