1.1 --- a/simplify/annotate.py Sun Jun 24 20:06:24 2007 +0200
1.2 +++ b/simplify/annotate.py Sun Jun 24 21:55:51 2007 +0200
1.3 @@ -751,10 +751,11 @@
1.4
1.5 # NOTE: This is dependent on the tuple definition in the builtins.
1.6
1.7 - for node in maketuple.nodes:
1.8 + for i, node in enumerate(maketuple.nodes):
1.9 self.dispatch(node)
1.10 for t in tuples:
1.11 t.type.namespace.add("value", self.namespace.types)
1.12 + t.type.namespace.add("__value__%d" % i, self.namespace.types)
1.13
1.14 self.namespace.set_types(tuples)
1.15 self.annotate(maketuple)
1.16 @@ -976,7 +977,7 @@
1.17 # Utility methods.
1.18
1.19 def get_builtin_instances(self, node, name):
1.20 - return set([Attribute(None, self.new_instance(node, attr.type)) for attr in self.builtins.namespace[name]])
1.21 + return set([Attribute(None, self.new_instance(node, attr.type)) for attr in self.builtins_namespace[name]])
1.22
1.23 def new_instance(self, node, type):
1.24