1.1 --- a/micropython/data.py Mon Jul 01 12:57:30 2013 +0200
1.2 +++ b/micropython/data.py Tue Jul 02 00:51:04 2013 +0200
1.3 @@ -582,17 +582,9 @@
1.4
1.5 self.reset_caches()
1.6
1.7 - # Image generation details.
1.8 -
1.9 - self.location = None
1.10 - self.code_location = None
1.11 - self.code_body_location = None # corresponds to the instantiator
1.12 + # Program-related details.
1.13
1.14 self.instantiator = None
1.15 - self.instance_template_location = None # for creating instances at run-time
1.16 -
1.17 - # Program-related details.
1.18 -
1.19 self.blocks = None
1.20 self.temp_usage = 0
1.21 self.local_usage = 0
1.22 @@ -622,10 +614,7 @@
1.23 self.allattr_names = None # from allattr
1.24
1.25 def __repr__(self):
1.26 - if self.location is not None:
1.27 - return "<class %s (at %r)>" % (shortrepr(self), self.location)
1.28 - else:
1.29 - return "<class %s>" % shortrepr(self)
1.30 + return "<class %s>" % shortrepr(self)
1.31
1.32 def __shortrepr__(self):
1.33 return "%s.%s" % (shortrepr(self.parent), self.name)
1.34 @@ -823,6 +812,14 @@
1.35 self.finalise_instance_attributes()
1.36 return self.all_instattr
1.37
1.38 + def instance_attributes_as_list(self):
1.39 +
1.40 + "Return instance-only attributes in a list ordered by position."
1.41 +
1.42 + attrs = self.instance_attributes().values()
1.43 + attrs.sort(cmp=lambda x, y: cmp(x.position, y.position))
1.44 + return attrs
1.45 +
1.46 def finalise_instance_attributes(self):
1.47
1.48 "Make sure that the instance attributes are fully defined."
1.49 @@ -1042,9 +1039,6 @@
1.50 # Image generation details.
1.51
1.52 self.dynamic = None
1.53 - self.location = None
1.54 - self.code_location = None
1.55 - self.code_body_location = None
1.56
1.57 # Program-related details.
1.58
1.59 @@ -1076,12 +1070,7 @@
1.60 return l
1.61
1.62 def __repr__(self):
1.63 - if self.location is not None:
1.64 - return "<function %s (at %r, code at %r)>" % (
1.65 - shortrepr(self), self.location, self.code_location
1.66 - )
1.67 - else:
1.68 - return "<function %s>" % shortrepr(self)
1.69 + return "<function %s>" % shortrepr(self)
1.70
1.71 def __shortrepr__(self):
1.72 return "%s.%s(%s)" % (shortrepr(self.parent), self.name, ", ".join(self.argnames))
1.73 @@ -1349,11 +1338,6 @@
1.74
1.75 self.keyword_names = set()
1.76
1.77 - # Image generation details.
1.78 -
1.79 - self.location = None
1.80 - self.code_location = None
1.81 -
1.82 # Program-related details.
1.83
1.84 self.blocks = None
1.85 @@ -1365,10 +1349,7 @@
1.86 return self.name
1.87
1.88 def __repr__(self):
1.89 - if self.location is not None:
1.90 - return "<module %s (at %r)>" % (self.name, self.location)
1.91 - else:
1.92 - return "<module %s>" % shortrepr(self)
1.93 + return "<module %s>" % shortrepr(self)
1.94
1.95 def __shortrepr__(self):
1.96 return self.name