[pypy-commit] pypy stmgc-c4: rename of transform2.py to transform.py

[Raemi]

Author: Remi Meier <meierrem at student.ethz.ch>
Branch: stmgc-c4
Changeset: r65195:88d375dc39b3
Date: 2013-07-05 13:08 +0200
http://bitbucket.org/pypy/pypy/changeset/88d375dc39b3/

Log:	rename of transform2.py to transform.py

diff --git a/rpython/translator/c/genc.py b/rpython/translator/c/genc.py
--- a/rpython/translator/c/genc.py
+++ b/rpython/translator/c/genc.py
@@ -141,11 +141,11 @@
         translator = self.translator
 
         if self.config.translation.stm:
-            from rpython.translator.stm import transform2
+            from rpython.translator.stm import transform
             self.getentrypointptr()    # build the wrapper first
             # ^^ this is needed to make sure we see the no-GC wrapper function
             # calling the GC entrypoint function.
-            stmtransformer = transform2.STMTransformer(self.translator)
+            stmtransformer = transform.STMTransformer(self.translator)
             stmtransformer.transform()
 
         gcpolicyclass = self.get_gcpolicyclass()
diff --git a/rpython/translator/stm/test/test_jitdriver.py b/rpython/translator/stm/test/test_jitdriver.py
--- a/rpython/translator/stm/test/test_jitdriver.py
+++ b/rpython/translator/stm/test/test_jitdriver.py
@@ -1,5 +1,5 @@
 from rpython.rtyper.lltypesystem import lltype, rffi
-from rpython.translator.stm.test.transform2_support import BaseTestTransform
+from rpython.translator.stm.test.transform_support import BaseTestTransform
 from rpython.rlib.jit import JitDriver
 
 
diff --git a/rpython/translator/stm/test/test_writebarrier.py b/rpython/translator/stm/test/test_writebarrier.py
--- a/rpython/translator/stm/test/test_writebarrier.py
+++ b/rpython/translator/stm/test/test_writebarrier.py
@@ -1,5 +1,5 @@
 from rpython.rtyper.lltypesystem import lltype, rffi
-from rpython.translator.stm.test.transform2_support import BaseTestTransform
+from rpython.translator.stm.test.transform_support import BaseTestTransform
 
 
 class TestTransform(BaseTestTransform):
diff --git a/rpython/translator/stm/test/transform2_support.py b/rpython/translator/stm/test/transform_support.py
rename from rpython/translator/stm/test/transform2_support.py
rename to rpython/translator/stm/test/transform_support.py
--- a/rpython/translator/stm/test/transform2_support.py
+++ b/rpython/translator/stm/test/transform_support.py
@@ -1,7 +1,7 @@
 from rpython.rtyper.lltypesystem import lltype, opimpl
 from rpython.rtyper.llinterp import LLFrame
 from rpython.rtyper.test.test_llinterp import get_interpreter, clear_tcache
-from rpython.translator.stm.transform2 import STMTransformer
+from rpython.translator.stm.transform import STMTransformer
 from rpython.translator.stm.writebarrier import MORE_PRECISE_CATEGORIES
 from rpython.conftest import option
 
diff --git a/rpython/translator/stm/transform2.py b/rpython/translator/stm/transform.py
rename from rpython/translator/stm/transform2.py
rename to rpython/translator/stm/transform.py
--- a/rpython/translator/stm/transform2.py
+++ b/rpython/translator/stm/transform.py
@@ -1,3 +1,10 @@
+from rpython.translator.backendopt.writeanalyze import WriteAnalyzer
+from rpython.translator.stm.writebarrier import insert_stm_barrier
+from rpython.translator.stm.inevitable import insert_turn_inevitable
+from rpython.translator.stm.jitdriver import reorganize_around_jit_driver
+from rpython.translator.stm.threadlocalref import transform_tlref
+from rpython.translator.c.support import log
+
 
 class STMTransformer(object):
 
@@ -18,38 +25,27 @@
         self.print_logs_after_gc()
 
     def transform_write_barrier(self):
-        from rpython.translator.backendopt.writeanalyze import WriteAnalyzer
-        from rpython.translator.stm.writebarrier import insert_stm_barrier
-        #
         self.write_analyzer = WriteAnalyzer(self.translator)
         for graph in self.translator.graphs:
             insert_stm_barrier(self, graph)
         del self.write_analyzer
 
     def transform_turn_inevitable(self):
-        from rpython.translator.stm.inevitable import insert_turn_inevitable
-        #
         for graph in self.translator.graphs:
             insert_turn_inevitable(graph)
 
     def transform_jit_driver(self):
-        from rpython.translator.stm.jitdriver import reorganize_around_jit_driver
-        #
         for graph in self.translator.graphs:
             reorganize_around_jit_driver(self, graph)
 
     def transform_threadlocalref(self):
-        from rpython.translator.stm.threadlocalref import transform_tlref
         transform_tlref(self.translator)
 
     def start_log(self):
-        from rpython.translator.c.support import log
         log.info("Software Transactional Memory transformation")
 
     def print_logs(self):
-        from rpython.translator.c.support import log
         log.info("Software Transactional Memory transformation applied")
 
     def print_logs_after_gc(self):
-        from rpython.translator.c.support import log
         log.info("Software Transactional Memory transformation-after-gc done")