[pypy-commit] pypy expressions-2: move V_Type to flowspace/

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: expressions-2
Changeset: r74561:929d4201c3b7
Date: 2014-11-11 19:53 +0000
http://bitbucket.org/pypy/pypy/changeset/929d4201c3b7/

Log:	move V_Type to flowspace/

diff --git a/rpython/annotator/expression.py b/rpython/flowspace/expression.py
rename from rpython/annotator/expression.py
rename to rpython/flowspace/expression.py
diff --git a/rpython/flowspace/generator.py b/rpython/flowspace/generator.py
--- a/rpython/flowspace/generator.py
+++ b/rpython/flowspace/generator.py
@@ -106,7 +106,7 @@
 def tweak_generator_body_graph(Entry, graph):
     # First, always run simplify_graph in order to reduce the number of
     # variables passed around
-    from rpython.annotator.expression import V_Type
+    from rpython.flowspace.expression import V_Type
     simplify_graph(graph)
     insert_empty_startblock(None, graph)
     _insert_reads(graph.startblock, Entry.varnames)
diff --git a/rpython/flowspace/operation.py b/rpython/flowspace/operation.py
--- a/rpython/flowspace/operation.py
+++ b/rpython/flowspace/operation.py
@@ -453,7 +453,7 @@
         if result is not None:
             return result
         ctx.merge_point()
-        from rpython.annotator.expression import V_Type
+        from rpython.flowspace.expression import V_Type
         v_instance, = self.args
         return V_Type(v_instance)
 
diff --git a/rpython/translator/simplify.py b/rpython/translator/simplify.py
--- a/rpython/translator/simplify.py
+++ b/rpython/translator/simplify.py
@@ -11,7 +11,7 @@
 from rpython.flowspace.model import (Variable, Constant,
                                      c_last_exception, checkgraph, mkentrymap)
 from rpython.flowspace.operation import OverflowingOperation, op
-from rpython.annotator.expression import V_Type
+from rpython.flowspace.expression import V_Type
 from rpython.rlib import rarithmetic
 from rpython.translator import unsimplify
 from rpython.rtyper.lltypesystem import lloperation, lltype
diff --git a/rpython/translator/transform.py b/rpython/translator/transform.py
--- a/rpython/translator/transform.py
+++ b/rpython/translator/transform.py
@@ -8,7 +8,7 @@
 from rpython.flowspace.model import SpaceOperation
 from rpython.flowspace.model import Variable, Constant, Link
 from rpython.flowspace.model import c_last_exception, checkgraph
-from rpython.annotator.expression import V_Type
+from rpython.flowspace.expression import V_Type
 from rpython.annotator import model as annmodel
 from rpython.rtyper.lltypesystem import lltype