1.1 --- a/simplify/simplified/utils.py Sat Jun 23 21:10:01 2007 +0200
1.2 +++ b/simplify/simplified/utils.py Sun Jun 24 03:21:23 2007 +0200
1.3 @@ -261,7 +261,7 @@
1.4 new_types.remove(type)
1.5 self.temp[index][-1] = new_types
1.6
1.7 - def merge_namespace(self, namespace, everything=1):
1.8 + def merge_namespace(self, namespace, everything=1, temp=1):
1.9
1.10 """
1.11 Merge items from the given 'namespace' with this namespace. When the
1.12 @@ -275,11 +275,12 @@
1.13 if everything:
1.14 self.returns.update(namespace.returns)
1.15 self.return_locals.update(namespace.return_locals)
1.16 - for name, values in namespace.temp.items():
1.17 - if values:
1.18 - if not self.temp.has_key(name) or not self.temp[name]:
1.19 - self.temp[name] = [set()]
1.20 - self.temp[name][-1].update(values[-1])
1.21 + if temp:
1.22 + for name, values in namespace.temp.items():
1.23 + if values:
1.24 + if not self.temp.has_key(name) or not self.temp[name]:
1.25 + self.temp[name] = [set()]
1.26 + self.temp[name][-1].update(values[-1])
1.27
1.28 def merge_items(self, items):
1.29