[pypy-svn] r31368 - in pypy/dist/pypy: rpython/memory translator translator/backendopt/test translator/c translator/stackless translator/stackless/test

[pedronis at codespeak.net]

Author: pedronis
Date: Thu Aug 17 15:40:48 2006
New Revision: 31368

Modified:
   pypy/dist/pypy/rpython/memory/gctransform.py
   pypy/dist/pypy/translator/backendopt/test/test_support.py
   pypy/dist/pypy/translator/c/exceptiontransform.py
   pypy/dist/pypy/translator/stackless/test/test_transform.py
   pypy/dist/pypy/translator/stackless/transform.py
   pypy/dist/pypy/translator/unsimplify.py
Log:
one common version of varoftype



Modified: pypy/dist/pypy/rpython/memory/gctransform.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gctransform.py	(original)
+++ pypy/dist/pypy/rpython/memory/gctransform.py	Thu Aug 17 15:40:48 2006
@@ -3,6 +3,7 @@
 from pypy.rpython.lltypesystem.lloperation import llop, LL_OPERATIONS
 from pypy.objspace.flow.model import SpaceOperation, Variable, Constant, \
      c_last_exception, FunctionGraph, Block, Link, checkgraph
+from pypy.translator.unsimplify import varoftype
 from pypy.translator.unsimplify import insert_empty_block
 from pypy.translator.unsimplify import insert_empty_startblock
 from pypy.translator.unsimplify import starts_with_empty_block
@@ -649,11 +650,6 @@
                                                v_addr],
                                varoftype(lltype.Void))]
 
-def varoftype(concretetype):
-    var = Variable()
-    var.concretetype = concretetype
-    return var
-
 def find_gc_ptrs_in_type(TYPE):
     if isinstance(TYPE, lltype.Array):
         return find_gc_ptrs_in_type(TYPE.OF)

Modified: pypy/dist/pypy/translator/backendopt/test/test_support.py
==============================================================================
--- pypy/dist/pypy/translator/backendopt/test/test_support.py	(original)
+++ pypy/dist/pypy/translator/backendopt/test/test_support.py	Thu Aug 17 15:40:48 2006
@@ -1,3 +1,4 @@
+from pypy.translator.unsimplify import varoftype
 from pypy.translator.translator import TranslationContext, graphof
 from pypy.translator.backendopt.support import \
      needs_conservative_livevar_calculation, split_block_with_keepalive, \
@@ -10,11 +11,6 @@
 NonGcB = lltype.Struct("B", ('x', lltype.Signed))
 GcA = lltype.GcStruct("A", ('b', NonGcB), ('c', lltype.Ptr(lltype.FuncType([], lltype.Void))))
 
-def varoftype(concretetype):
-    var = model.Variable()
-    var.concretetype = concretetype
-    return var
-
 def test_nclc_should_be_true():
     # this is testing a block like:
     # +--- inputargs: pointer_to_gc

Modified: pypy/dist/pypy/translator/c/exceptiontransform.py
==============================================================================
--- pypy/dist/pypy/translator/c/exceptiontransform.py	(original)
+++ pypy/dist/pypy/translator/c/exceptiontransform.py	Thu Aug 17 15:40:48 2006
@@ -1,12 +1,11 @@
 from pypy.translator.simplify import join_blocks, cleanup_graph
-from pypy.translator.unsimplify import copyvar
+from pypy.translator.unsimplify import copyvar, varoftype
 from pypy.translator.backendopt import canraise, inline, support, removenoops
 from pypy.objspace.flow.model import Block, Constant, Variable, Link, \
     c_last_exception, SpaceOperation, checkgraph, FunctionGraph
 from pypy.rpython.lltypesystem import lltype, llmemory
 from pypy.rpython.lltypesystem import lloperation
 from pypy.rpython.memory.lladdress import NULL
-from pypy.rpython.memory.gctransform import varoftype
 from pypy.rpython import rtyper
 from pypy.rpython import rclass
 from pypy.rpython.rarithmetic import r_uint, r_longlong, r_ulonglong

Modified: pypy/dist/pypy/translator/stackless/test/test_transform.py
==============================================================================
--- pypy/dist/pypy/translator/stackless/test/test_transform.py	(original)
+++ pypy/dist/pypy/translator/stackless/test/test_transform.py	Thu Aug 17 15:40:48 2006
@@ -3,7 +3,7 @@
 from pypy.translator.stackless.transform import StacklessTransformer, FrameTyper
 from pypy.translator.c.genc import CStandaloneBuilder
 from pypy.translator.c import gc
-from pypy.rpython.memory.gctransform import varoftype
+from pypy.translator.unsimplify import varoftype
 from pypy.rpython.lltypesystem import lltype, llmemory
 from pypy.rpython import llinterp, rstack
 from pypy.translator.translator import TranslationContext, graphof

Modified: pypy/dist/pypy/translator/stackless/transform.py
==============================================================================
--- pypy/dist/pypy/translator/stackless/transform.py	(original)
+++ pypy/dist/pypy/translator/stackless/transform.py	Thu Aug 17 15:40:48 2006
@@ -3,8 +3,8 @@
 from pypy.rpython import rarithmetic, rclass, rmodel
 from pypy.translator.backendopt import support
 from pypy.objspace.flow import model
-from pypy.rpython.memory.gctransform import varoftype
 from pypy.translator import unsimplify, simplify
+from pypy.translator.unsimplify import varoftype
 from pypy.annotation import model as annmodel
 from pypy.rpython.annlowlevel import MixLevelHelperAnnotator
 from pypy.translator.stackless import code, frame

Modified: pypy/dist/pypy/translator/unsimplify.py
==============================================================================
--- pypy/dist/pypy/translator/unsimplify.py	(original)
+++ pypy/dist/pypy/translator/unsimplify.py	Thu Aug 17 15:40:48 2006
@@ -10,6 +10,11 @@
         newvar.concretetype = v.concretetype
     return newvar
 
+def varoftype(concretetype, name=None):
+    var = Variable(name)
+    var.concretetype = concretetype
+    return var
+
 def insert_empty_block(annotator, link, newops=[]):
     """Insert and return a new block along the given link."""
     vars = {}