1.1 --- a/micropython/data.py Mon May 19 00:22:00 2008 +0200
1.2 +++ b/micropython/data.py Sat Jun 07 21:55:24 2008 +0200
1.3 @@ -146,7 +146,7 @@
1.4 if not self.namespace.has_key(name):
1.5 self.globals.add(name)
1.6 else:
1.7 - raise InspectError(self.full_name(), self.node, "Name %r is both global and local in %r" % (name, self.full_name()))
1.8 + raise InspectError(self.full_name(), self.astnode, "Name %r is both global and local in %r" % (name, self.full_name()))
1.9
1.10 def get_assignments(self, name):
1.11 if self.assignments.has_key(name):
1.12 @@ -319,7 +319,7 @@
1.13 NamespaceDict.__init__(self, global_namespace)
1.14 self.name = name
1.15 self.parent = parent
1.16 - self.node = node
1.17 + self.astnode = node
1.18
1.19 # Superclasses, descendants and attributes.
1.20
1.21 @@ -641,7 +641,7 @@
1.22 self.defaults = defaults
1.23 self.has_star = has_star
1.24 self.has_dstar = has_dstar
1.25 - self.node = node
1.26 + self.astnode = node
1.27
1.28 # Initialise the positional names.
1.29
1.30 @@ -709,7 +709,7 @@
1.31 if name not in self.argnames and not self.has_key(name):
1.32 self.globals.add(name)
1.33 else:
1.34 - raise InspectError(self.full_name(), self.node, "Name %r is global and local in %r" % (name, self.full_name()))
1.35 + raise InspectError(self.full_name(), self.astnode, "Name %r is global and local in %r" % (name, self.full_name()))
1.36
1.37 def parameters(self):
1.38
1.39 @@ -789,7 +789,7 @@
1.40 "Make a function from a method."
1.41
1.42 function = Function(self.name, self.parent, self.argnames[1:], self.defaults,
1.43 - self.has_star, self.has_dstar, self.global_namespace, self.node)
1.44 + self.has_star, self.has_dstar, self.global_namespace, self.astnode)
1.45 function.default_attrs = self.default_attrs
1.46 return function
1.47
1.48 @@ -831,7 +831,7 @@
1.49
1.50 # Original location details.
1.51
1.52 - self.node = None
1.53 + self.astnode = None
1.54
1.55 # Complete lists of classes and functions.
1.56