Author: Manuel Jacob
Branch: remove-tuple-smm
Changeset: r64416:8c199c93b314
Date: 2013-05-22 03:08 +0200
http://bitbucket.org/pypy/pypy/changeset/8c199c93b314/
Log: Kill tupletype.py.
diff --git a/pypy/objspace/std/objspace.py b/pypy/objspace/std/objspace.py
--- a/pypy/objspace/std/objspace.py
+++ b/pypy/objspace/std/objspace.py
@@ -281,7 +281,7 @@
return newlong(self, val)
def newtuple(self, list_w):
- from pypy.objspace.std.tupletype import wraptuple
+ from pypy.objspace.std.tupleobject import wraptuple
assert isinstance(list_w, list)
make_sure_not_resized(list_w)
return wraptuple(self, list_w)
diff --git a/pypy/objspace/std/tupleobject.py b/pypy/objspace/std/tupleobject.py
--- a/pypy/objspace/std/tupleobject.py
+++ b/pypy/objspace/std/tupleobject.py
@@ -290,5 +290,35 @@
x += 97531
return intmask(x)
-from pypy.objspace.std import tupletype
-tupletype.tuple_typedef = W_TupleObject.typedef
+
+def wraptuple(space, list_w):
+ if space.config.objspace.std.withspecialisedtuple:
+ from specialisedtupleobject import makespecialisedtuple, NotSpecialised
+ try:
+ return makespecialisedtuple(space, list_w)
+ except NotSpecialised:
+ pass
+
+ if space.config.objspace.std.withsmalltuple:
+ from pypy.objspace.std.smalltupleobject import W_SmallTupleObject2
+ from pypy.objspace.std.smalltupleobject import W_SmallTupleObject3
+ from pypy.objspace.std.smalltupleobject import W_SmallTupleObject4
+ from pypy.objspace.std.smalltupleobject import W_SmallTupleObject5
+ from pypy.objspace.std.smalltupleobject import W_SmallTupleObject6
+ from pypy.objspace.std.smalltupleobject import W_SmallTupleObject7
+ from pypy.objspace.std.smalltupleobject import W_SmallTupleObject8
+ if len(list_w) == 2:
+ return W_SmallTupleObject2(list_w)
+ if len(list_w) == 3:
+ return W_SmallTupleObject3(list_w)
+ if len(list_w) == 4:
+ return W_SmallTupleObject4(list_w)
+ if len(list_w) == 5:
+ return W_SmallTupleObject5(list_w)
+ if len(list_w) == 6:
+ return W_SmallTupleObject6(list_w)
+ if len(list_w) == 7:
+ return W_SmallTupleObject7(list_w)
+ if len(list_w) == 8:
+ return W_SmallTupleObject8(list_w)
+ return W_TupleObject(list_w)
diff --git a/pypy/objspace/std/tupletype.py b/pypy/objspace/std/tupletype.py
deleted file mode 100644
--- a/pypy/objspace/std/tupletype.py
+++ /dev/null
@@ -1,36 +0,0 @@
-from pypy.objspace.std.register_all import register_all
-
-def wraptuple(space, list_w):
- from pypy.objspace.std.tupleobject import W_TupleObject
-
- if space.config.objspace.std.withspecialisedtuple:
- from specialisedtupleobject import makespecialisedtuple, NotSpecialised
- try:
- return makespecialisedtuple(space, list_w)
- except NotSpecialised:
- pass
-
- if space.config.objspace.std.withsmalltuple:
- from pypy.objspace.std.smalltupleobject import W_SmallTupleObject2
- from pypy.objspace.std.smalltupleobject import W_SmallTupleObject3
- from pypy.objspace.std.smalltupleobject import W_SmallTupleObject4
- from pypy.objspace.std.smalltupleobject import W_SmallTupleObject5
- from pypy.objspace.std.smalltupleobject import W_SmallTupleObject6
- from pypy.objspace.std.smalltupleobject import W_SmallTupleObject7
- from pypy.objspace.std.smalltupleobject import W_SmallTupleObject8
- if len(list_w) == 2:
- return W_SmallTupleObject2(list_w)
- if len(list_w) == 3:
- return W_SmallTupleObject3(list_w)
- if len(list_w) == 4:
- return W_SmallTupleObject4(list_w)
- if len(list_w) == 5:
- return W_SmallTupleObject5(list_w)
- if len(list_w) == 6:
- return W_SmallTupleObject6(list_w)
- if len(list_w) == 7:
- return W_SmallTupleObject7(list_w)
- if len(list_w) == 8:
- return W_SmallTupleObject8(list_w)
- return W_TupleObject(list_w)
-
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
