[pypy-svn] r21874 - in pypy/dist/pypy: annotation annotation/test module/_socket/rpython/test module/thread/rpython/test rpython rpython/memory rpython/memory/test rpython/ootypesystem/test rpython/test translator translator/goal translator/pyrex translator/test translator/tool
cfbolz at codespeak.net
cfbolz at codespeak.net
Tue Jan 10 14:12:10 CET 2006
Author: cfbolz
Date: Tue Jan 10 14:11:57 2006
New Revision: 21874
Added:
pypy/dist/pypy/annotation/annrpython.py
- copied unchanged from r21864, pypy/dist/pypy/translator/annrpython.py
pypy/dist/pypy/annotation/test/test_annmm.py
- copied, changed from r21868, pypy/dist/pypy/translator/test/test_annmm.py
pypy/dist/pypy/annotation/test/test_annrpython.py
- copied, changed from r21864, pypy/dist/pypy/translator/test/test_annrpython.py
pypy/dist/pypy/annotation/test/test_annsimplifyrpython.py
- copied, changed from r21864, pypy/dist/pypy/translator/test/test_annsimplifyrpython.py
pypy/dist/pypy/translator/goal/ann_override.py
- copied unchanged from r21868, pypy/dist/pypy/translator/ann_override.py
Removed:
pypy/dist/pypy/translator/ann_override.py
pypy/dist/pypy/translator/annrpython.py
pypy/dist/pypy/translator/test/test_annmm.py
pypy/dist/pypy/translator/test/test_annrpython.py
pypy/dist/pypy/translator/test/test_annsimplifyrpython.py
Modified:
pypy/dist/pypy/module/_socket/rpython/test/test_ll__socket.py
pypy/dist/pypy/module/thread/rpython/test/test_ll_thread.py
pypy/dist/pypy/rpython/memory/gcwrapper.py
pypy/dist/pypy/rpython/memory/test/test_address.py
pypy/dist/pypy/rpython/memory/test/test_gc.py
pypy/dist/pypy/rpython/ootypesystem/test/test_ooann.py
pypy/dist/pypy/rpython/rtyper.py
pypy/dist/pypy/rpython/test/test_llann.py
pypy/dist/pypy/rpython/test/test_nongc.py
pypy/dist/pypy/rpython/test/test_rpbc.py
pypy/dist/pypy/rpython/test/test_rptr.py
pypy/dist/pypy/rpython/test/test_rtyper.py
pypy/dist/pypy/translator/gencl.py
pypy/dist/pypy/translator/goal/targetmultiplespaces.py
pypy/dist/pypy/translator/goal/targetpypymain.py
pypy/dist/pypy/translator/goal/targetpypystandalone.py
pypy/dist/pypy/translator/goal/targetthunkstandalone.py
pypy/dist/pypy/translator/pyrex/genpyrex.py
pypy/dist/pypy/translator/tool/tracer.py
pypy/dist/pypy/translator/translator.py
Log:
move all the files that are relevant to the annotator from pypy/translator to
pypy/annotation:
* annrpython.py
* test/test_annrpython.py
* test/test_annsimplifyrpython.py
* test/test_annmm.py
moved pypy/translator/ann_override to pypy/translator/goal. It does not belong
to annotation as it is PyPy specific.
Fixed all the references to the moved files.
Modified: pypy/dist/pypy/module/_socket/rpython/test/test_ll__socket.py
==============================================================================
--- pypy/dist/pypy/module/_socket/rpython/test/test_ll__socket.py (original)
+++ pypy/dist/pypy/module/_socket/rpython/test/test_ll__socket.py Tue Jan 10 14:11:57 2006
@@ -2,7 +2,7 @@
import _socket
import pypy.module._socket.rpython.exttable
from pypy.module._socket.rpython.ll__socket import *
-from pypy.translator.annrpython import RPythonAnnotator
+from pypy.annotation.annrpython import RPythonAnnotator
from pypy.rpython.test.test_llinterp import interpret
from pypy.rpython.module.support import from_rstr
from pypy.rpython.module.support import to_opaque_object, from_opaque_object
Modified: pypy/dist/pypy/module/thread/rpython/test/test_ll_thread.py
==============================================================================
--- pypy/dist/pypy/module/thread/rpython/test/test_ll_thread.py (original)
+++ pypy/dist/pypy/module/thread/rpython/test/test_ll_thread.py Tue Jan 10 14:11:57 2006
@@ -1,7 +1,7 @@
import thread
import pypy.module.thread.rpython.exttable # for declare()/declaretype()
from pypy.module.thread.rpython.ll_thread import *
-from pypy.translator.annrpython import RPythonAnnotator
+from pypy.annotation.annrpython import RPythonAnnotator
from pypy.rpython.test.test_llinterp import interpret
Modified: pypy/dist/pypy/rpython/memory/gcwrapper.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/gcwrapper.py (original)
+++ pypy/dist/pypy/rpython/memory/gcwrapper.py Tue Jan 10 14:11:57 2006
@@ -1,4 +1,4 @@
-from pypy.translator.annrpython import RPythonAnnotator
+from pypy.annotation.annrpython import RPythonAnnotator
from pypy.rpython.rtyper import RPythonTyper
from pypy.rpython.lltypesystem import lltype
from pypy.rpython.memory.support import AddressLinkedList, INT_SIZE
Modified: pypy/dist/pypy/rpython/memory/test/test_address.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/test/test_address.py (original)
+++ pypy/dist/pypy/rpython/memory/test/test_address.py Tue Jan 10 14:11:57 2006
@@ -2,7 +2,7 @@
import sys
from pypy.annotation import model as annmodel
-from pypy.translator.annrpython import RPythonAnnotator
+from pypy.annotation.annrpython import RPythonAnnotator
from pypy.translator.translator import graphof
from pypy.objspace.flow import FlowObjSpace
from pypy.rpython.rtyper import RPythonTyper
Modified: pypy/dist/pypy/rpython/memory/test/test_gc.py
==============================================================================
--- pypy/dist/pypy/rpython/memory/test/test_gc.py (original)
+++ pypy/dist/pypy/rpython/memory/test/test_gc.py Tue Jan 10 14:11:57 2006
@@ -2,7 +2,7 @@
import sys
from pypy.annotation import model as annmodel
-from pypy.translator.annrpython import RPythonAnnotator
+from pypy.annotation.annrpython import RPythonAnnotator
from pypy.rpython.rtyper import RPythonTyper
from pypy.rpython.memory.gc import GCError, MarkSweepGC, SemiSpaceGC
from pypy.rpython.memory.gc import DeferredRefcountingGC, DummyGC
Modified: pypy/dist/pypy/rpython/ootypesystem/test/test_ooann.py
==============================================================================
--- pypy/dist/pypy/rpython/ootypesystem/test/test_ooann.py (original)
+++ pypy/dist/pypy/rpython/ootypesystem/test/test_ooann.py Tue Jan 10 14:11:57 2006
@@ -1,7 +1,7 @@
from pypy.rpython.ootypesystem.ootype import *
from pypy.annotation import model as annmodel
from pypy.objspace.flow import FlowObjSpace
-from pypy.translator.annrpython import RPythonAnnotator
+from pypy.annotation.annrpython import RPythonAnnotator
def test_simple_new():
Modified: pypy/dist/pypy/rpython/rtyper.py
==============================================================================
--- pypy/dist/pypy/rpython/rtyper.py (original)
+++ pypy/dist/pypy/rpython/rtyper.py Tue Jan 10 14:11:57 2006
@@ -7,7 +7,7 @@
operations that are collected in the 'llops' list defined here. When necessary,
conversions are inserted.
-This logic borrows a bit from pypy.translator.annrpython, without the fixpoint
+This logic borrows a bit from pypy.annotation.annrpython, without the fixpoint
computation part.
"""
Modified: pypy/dist/pypy/rpython/test/test_llann.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_llann.py (original)
+++ pypy/dist/pypy/rpython/test/test_llann.py Tue Jan 10 14:11:57 2006
@@ -21,7 +21,7 @@
def setup_class(cls):
cls.space = FlowObjSpace()
- from pypy.translator.annrpython import RPythonAnnotator
+ from pypy.annotation.annrpython import RPythonAnnotator
def annotate(self, ll_function, argtypes):
self.a = self.RPythonAnnotator()
Modified: pypy/dist/pypy/rpython/test/test_nongc.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_nongc.py (original)
+++ pypy/dist/pypy/rpython/test/test_nongc.py Tue Jan 10 14:11:57 2006
@@ -1,7 +1,7 @@
import py
from pypy.annotation import model as annmodel
-from pypy.translator.annrpython import RPythonAnnotator
+from pypy.annotation.annrpython import RPythonAnnotator
from pypy.rpython.rtyper import RPythonTyper
from pypy.rpython.objectmodel import free_non_gc_object
from pypy.rpython.test.test_llinterp import interpret
Modified: pypy/dist/pypy/rpython/test/test_rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rpbc.py (original)
+++ pypy/dist/pypy/rpython/test/test_rpbc.py Tue Jan 10 14:11:57 2006
@@ -877,7 +877,7 @@
def f(a,b):
return a + b
from pypy.translator import translator
- from pypy.translator import annrpython
+ from pypy.annotation import annrpython
a = annrpython.RPythonAnnotator()
from pypy.annotation import model as annmodel
@@ -915,7 +915,7 @@
return a + b
def f2(a,b):
return a - b
- from pypy.translator import annrpython
+ from pypy.annotation import annrpython
a = annrpython.RPythonAnnotator()
from pypy.annotation import model as annmodel
@@ -968,7 +968,7 @@
def f(a):
return A(a)
- from pypy.translator import annrpython
+ from pypy.annotation import annrpython
a = annrpython.RPythonAnnotator()
from pypy.annotation import model as annmodel
@@ -1017,7 +1017,7 @@
def f(self, a):
return A(a)
- from pypy.translator import annrpython
+ from pypy.annotation import annrpython
a = annrpython.RPythonAnnotator()
from pypy.annotation import model as annmodel
@@ -1077,7 +1077,7 @@
def f(self, a):
return A(a)
- from pypy.translator import annrpython
+ from pypy.annotation import annrpython
a = annrpython.RPythonAnnotator()
from pypy.annotation import model as annmodel
Modified: pypy/dist/pypy/rpython/test/test_rptr.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rptr.py (original)
+++ pypy/dist/pypy/rpython/test/test_rptr.py Tue Jan 10 14:11:57 2006
@@ -1,4 +1,4 @@
-from pypy.translator.annrpython import RPythonAnnotator
+from pypy.annotation.annrpython import RPythonAnnotator
from pypy.rpython.annlowlevel import annotate_lowlevel_helper, LowLevelAnnotatorPolicy
from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.rtyper import RPythonTyper
Modified: pypy/dist/pypy/rpython/test/test_rtyper.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rtyper.py (original)
+++ pypy/dist/pypy/rpython/test/test_rtyper.py Tue Jan 10 14:11:57 2006
@@ -1,7 +1,7 @@
from pypy.annotation import model as annmodel
from pypy.objspace.flow.model import Constant
from pypy.translator.translator import TranslationContext, graphof
-from pypy.translator import annrpython
+from pypy.annotation import annrpython
from pypy.rpython.lltypesystem.lltype import *
from pypy.rpython.test.test_llinterp import interpret
from pypy.rpython.rtyper import RPythonTyper
Modified: pypy/dist/pypy/translator/gencl.py
==============================================================================
--- pypy/dist/pypy/translator/gencl.py (original)
+++ pypy/dist/pypy/translator/gencl.py Tue Jan 10 14:11:57 2006
@@ -1,5 +1,5 @@
from pypy.objspace.flow.model import Constant, Variable, last_exception
-from pypy.translator.annrpython import RPythonAnnotator
+from pypy.annotation.annrpython import RPythonAnnotator
from pypy.translator.simplify import simplify_graph
from pypy.translator.transform import transform_graph, default_extra_passes, transform_slice
Modified: pypy/dist/pypy/translator/goal/targetmultiplespaces.py
==============================================================================
--- pypy/dist/pypy/translator/goal/targetmultiplespaces.py (original)
+++ pypy/dist/pypy/translator/goal/targetmultiplespaces.py Tue Jan 10 14:11:57 2006
@@ -7,7 +7,7 @@
from pypy.annotation.listdef import ListDef
from pypy.interpreter import gateway
from pypy.interpreter.error import OperationError
-from pypy.translator.ann_override import PyPyAnnotatorPolicy
+from pypy.translator.goal.ann_override import PyPyAnnotatorPolicy
# WARNING: this requires the annotator.
# There is no easy way to build all caches manually,
Modified: pypy/dist/pypy/translator/goal/targetpypymain.py
==============================================================================
--- pypy/dist/pypy/translator/goal/targetpypymain.py (original)
+++ pypy/dist/pypy/translator/goal/targetpypymain.py Tue Jan 10 14:11:57 2006
@@ -7,7 +7,7 @@
from pypy.annotation.listdef import ListDef
from pypy.interpreter import gateway
from pypy.interpreter.error import OperationError
-from pypy.translator.ann_override import PyPyAnnotatorPolicy
+from pypy.translator.goal.ann_override import PyPyAnnotatorPolicy
# WARNING: this requires the annotator.
# There is no easy way to build all caches manually,
Modified: pypy/dist/pypy/translator/goal/targetpypystandalone.py
==============================================================================
--- pypy/dist/pypy/translator/goal/targetpypystandalone.py (original)
+++ pypy/dist/pypy/translator/goal/targetpypystandalone.py Tue Jan 10 14:11:57 2006
@@ -7,7 +7,7 @@
from pypy.annotation.listdef import ListDef
from pypy.interpreter import gateway
from pypy.interpreter.error import OperationError
-from pypy.translator.ann_override import PyPyAnnotatorPolicy
+from pypy.translator.goal.ann_override import PyPyAnnotatorPolicy
# WARNING: this requires the annotator.
# There is no easy way to build all caches manually,
Modified: pypy/dist/pypy/translator/goal/targetthunkstandalone.py
==============================================================================
--- pypy/dist/pypy/translator/goal/targetthunkstandalone.py (original)
+++ pypy/dist/pypy/translator/goal/targetthunkstandalone.py Tue Jan 10 14:11:57 2006
@@ -7,7 +7,7 @@
from pypy.annotation.listdef import ListDef
from pypy.interpreter import gateway
from pypy.interpreter.error import OperationError
-from pypy.translator.ann_override import PyPyAnnotatorPolicy
+from pypy.translator.goal.ann_override import PyPyAnnotatorPolicy
# WARNING: this requires the annotator.
# There is no easy way to build all caches manually,
Modified: pypy/dist/pypy/translator/pyrex/genpyrex.py
==============================================================================
--- pypy/dist/pypy/translator/pyrex/genpyrex.py (original)
+++ pypy/dist/pypy/translator/pyrex/genpyrex.py Tue Jan 10 14:11:57 2006
@@ -6,7 +6,7 @@
from pypy.interpreter.argument import Arguments
from pypy.objspace.flow.model import Variable, Constant
from pypy.objspace.flow.model import mkentrymap, last_exception
-from pypy.translator.annrpython import RPythonAnnotator
+from pypy.annotation.annrpython import RPythonAnnotator
from pypy.annotation.model import SomePBC
from pypy.annotation.description import MethodDesc
from pypy.annotation.classdef import ClassDef
Modified: pypy/dist/pypy/translator/tool/tracer.py
==============================================================================
--- pypy/dist/pypy/translator/tool/tracer.py (original)
+++ pypy/dist/pypy/translator/tool/tracer.py Tue Jan 10 14:11:57 2006
@@ -1,7 +1,7 @@
import types, sys
from pypy.annotation.model import SomeValue, debugname
from pypy.annotation.annset import AnnotationSet
-from pypy.translator.annrpython import RPythonAnnotator
+from pypy.annotation.annrpython import RPythonAnnotator
indent1 = ['']
Modified: pypy/dist/pypy/translator/translator.py
==============================================================================
--- pypy/dist/pypy/translator/translator.py (original)
+++ pypy/dist/pypy/translator/translator.py Tue Jan 10 14:11:57 2006
@@ -62,7 +62,7 @@
def buildannotator(self, policy=None):
if self.annotator is not None:
raise ValueError("we already have an annotator")
- from pypy.translator.annrpython import RPythonAnnotator
+ from pypy.annotation.annrpython import RPythonAnnotator
self.annotator = RPythonAnnotator(self, policy=policy)
return self.annotator
@@ -244,7 +244,7 @@
if input_arg_types is None:
ann = self.annotator
else:
- from pypy.translator.annrpython import RPythonAnnotator
+ from pypy.annotation.annrpython import RPythonAnnotator
ann = RPythonAnnotator(self)
if func is None:
codes = [self.generatecode1(gencls, input_arg_types,
More information about the Pypy-commit
mailing list