[pypy-svn] r64900 - in pypy/trunk/pypy: rpython/memory/gctransform tool

[benjamin at codespeak.net]

Author: benjamin
Date: Fri May  1 00:35:50 2009
New Revision: 64900

Modified:
   pypy/trunk/pypy/rpython/memory/gctransform/statistics.py
   pypy/trunk/pypy/rpython/memory/gctransform/transform.py
   pypy/trunk/pypy/tool/import_graph.py
Log:
use builtin set instead of the sets module

Modified: pypy/trunk/pypy/rpython/memory/gctransform/statistics.py
==============================================================================
--- pypy/trunk/pypy/rpython/memory/gctransform/statistics.py	(original)
+++ pypy/trunk/pypy/rpython/memory/gctransform/statistics.py	Fri May  1 00:35:50 2009
@@ -13,19 +13,18 @@
     return isinstance(arg.concretetype, lltype.Ptr) and not arg.concretetype._needsgc()
 
 def relevant_gcvars_block(block, filter=filter_for_ptr):
-    import sets
     result = []
     def filter_ptr(args):
         return [arg for arg in args if filter(arg)]
     def live_vars_before(index):
         if index == 0:
-            return sets.Set(filter_ptr(block.inputargs))
+            return set(filter_ptr(block.inputargs))
         op = block.operations[index - 1]
         result = live_vars_before(index - 1).union(filter_ptr(op.args + [op.result]))
         return result
     def live_vars_after(index):
         if index == len(block.operations) - 1:
-            result = sets.Set()
+            result = set()
             for exit in block.exits:
                 result = result.union(filter_ptr(exit.args))
             return result

Modified: pypy/trunk/pypy/rpython/memory/gctransform/transform.py
==============================================================================
--- pypy/trunk/pypy/rpython/memory/gctransform/transform.py	(original)
+++ pypy/trunk/pypy/rpython/memory/gctransform/transform.py	Fri May  1 00:35:50 2009
@@ -18,7 +18,8 @@
 from pypy.rpython.rtyper import LowLevelOpList
 from pypy.rpython.rbuiltin import gen_cast
 from pypy.rlib.rarithmetic import ovfcheck
-import sets, os, sys
+import sys
+import os
 from pypy.rpython.lltypesystem.lloperation import llop
 from pypy.translator.simplify import join_blocks, cleanup_graph
 
@@ -194,15 +195,15 @@
         if len(block.exits) != 0: # i.e not the return block
             assert block.exitswitch is not c_last_exception
 
-            deadinallexits = sets.Set(self.livevars)
+            deadinallexits = set(self.livevars)
             for link in block.exits:
-                deadinallexits.difference_update(sets.Set(link.args))
+                deadinallexits.difference_update(set(link.args))
 
             for var in deadinallexits:
                 self.pop_alive(var, llops)
 
             for link in block.exits:
-                livecounts = dict.fromkeys(sets.Set(self.livevars) - deadinallexits, 1)
+                livecounts = dict.fromkeys(set(self.livevars) - deadinallexits, 1)
                 for v, v2 in zip(link.args, link.target.inputargs):
                     if is_borrowed(v2):
                         continue

Modified: pypy/trunk/pypy/tool/import_graph.py
==============================================================================
--- pypy/trunk/pypy/tool/import_graph.py	(original)
+++ pypy/trunk/pypy/tool/import_graph.py	Fri May  1 00:35:50 2009
@@ -4,7 +4,6 @@
 
 import math
 import random
-import sets
 
 exclude_files = ["__init__.py", "autopath.py", "conftest.py"]
 
@@ -89,7 +88,7 @@
         self.remove_double_refs()
         self.incoming = {}
         for mod in self.imports:
-            self.incoming[mod] = sets.Set()
+            self.incoming[mod] = set()
         for mod, refs in self.imports.iteritems():
             for ref in refs:
                 if ref[0] in self.incoming:
@@ -118,7 +117,7 @@
         # remove several references to the same module
         for mod, refs in self.imports.iteritems():
             i = 0
-            seen_refs = sets.Set()
+            seen_refs = set()
             while i < len(refs):
                 if refs[i] not in seen_refs:
                     seen_refs.add(refs[i])
@@ -139,7 +138,7 @@
     def create_clusters(self):
         self.topgraph_properties.append("compound=true;")
         self.clustered = True
-        hierarchy = [sets.Set() for i in range(6)]
+        hierarchy = [set() for i in range(6)]
         for mod in self.imports:
             for i, d in enumerate(mod.split(".")):
                 hierarchy[i].add(d)
@@ -151,7 +150,7 @@
             if i == len(mod.split(".")) - 1:
                 continue
             if cluster not in self.clusters:
-                self.clusters[cluster] = sets.Set()
+                self.clusters[cluster] = set()
             self.clusters[cluster].add(mod)
             self.mod_to_cluster[mod] = cluster
 
@@ -162,7 +161,7 @@
             if len(incoming) > 10:
                 tangled.append(mod)
         for mod in tangled:
-            remove = sets.Set()
+            remove = set()
             incoming = self.incoming[mod]
             while len(remove) < len(incoming) * 0.80:
                 remove.add(random.choice(list(incoming)))
@@ -196,7 +195,7 @@
             try:
                 nodes = self.clusters[self.mod_to_cluster[mod]]
             except KeyError:
-                nodes = sets.Set()
+                nodes = set()
             for ref in refs:
                 if ref[0] not in nodes:
                     f.write('\t"%s" -> "%s";\n' % (mod[5:], ref[0][5:]))