Author: Antonio Cuni <[email protected]>
Branch: unicode-strategies
Changeset: r58468:ff9660073713
Date: 2012-10-26 17:52 +0200
http://bitbucket.org/pypy/pypy/changeset/ff9660073713/
Log: add a unicode dict strategy
diff --git a/pypy/objspace/std/dictmultiobject.py
b/pypy/objspace/std/dictmultiobject.py
--- a/pypy/objspace/std/dictmultiobject.py
+++ b/pypy/objspace/std/dictmultiobject.py
@@ -207,6 +207,9 @@
if type(w_key) is self.space.StringObjectCls:
self.switch_to_string_strategy(w_dict)
return
+ elif type(w_key) is self.space.UnicodeObjectCls:
+ self.switch_to_unicode_strategy(w_dict)
+ return
w_type = self.space.type(w_key)
if self.space.is_w(w_type, self.space.w_int):
self.switch_to_int_strategy(w_dict)
@@ -221,6 +224,12 @@
w_dict.strategy = strategy
w_dict.dstorage = storage
+ def switch_to_unicode_strategy(self, w_dict):
+ strategy = self.space.fromcache(UnicodeDictStrategy)
+ storage = strategy.get_empty_storage()
+ w_dict.strategy = strategy
+ w_dict.dstorage = storage
+
def switch_to_int_strategy(self, w_dict):
strategy = self.space.fromcache(IntDictStrategy)
storage = strategy.get_empty_storage()
@@ -625,6 +634,73 @@
create_iterator_classes(StringDictStrategy)
+class UnicodeDictStrategy(AbstractTypedStrategy, DictStrategy):
+
+ erase, unerase = rerased.new_erasing_pair("unicode")
+ erase = staticmethod(erase)
+ unerase = staticmethod(unerase)
+
+ def wrap(self, unwrapped):
+ return self.space.wrap(unwrapped)
+
+ def unwrap(self, wrapped):
+ return self.space.unicode_w(wrapped)
+
+ def is_correct_type(self, w_obj):
+ space = self.space
+ return space.is_w(space.type(w_obj), space.w_unicode)
+
+ def get_empty_storage(self):
+ res = {}
+ mark_dict_non_null(res)
+ return self.erase(res)
+
+ def _never_equal_to(self, w_lookup_type):
+ return _never_equal_to_string(self.space, w_lookup_type)
+
+ # we should implement the same shortcuts as we do for StringDictStrategy
+
+ ## def setitem_str(self, w_dict, key, w_value):
+ ## assert key is not None
+ ## self.unerase(w_dict.dstorage)[key] = w_value
+
+ ## def getitem(self, w_dict, w_key):
+ ## space = self.space
+ ## # -- This is called extremely often. Hack for performance --
+ ## if type(w_key) is space.StringObjectCls:
+ ## return self.getitem_str(w_dict, w_key.unwrap(space))
+ ## # -- End of performance hack --
+ ## return AbstractTypedStrategy.getitem(self, w_dict, w_key)
+
+ ## def getitem_str(self, w_dict, key):
+ ## assert key is not None
+ ## return self.unerase(w_dict.dstorage).get(key, None)
+
+ ## def listview_str(self, w_dict):
+ ## return self.unerase(w_dict.dstorage).keys()
+
+ ## def w_keys(self, w_dict):
+ ## return self.space.newlist_str(self.listview_str(w_dict))
+
+ def wrapkey(space, key):
+ return space.wrap(key)
+
+ ## @jit.look_inside_iff(lambda self, w_dict:
+ ## w_dict_unrolling_heuristic(w_dict))
+ ## def view_as_kwargs(self, w_dict):
+ ## d = self.unerase(w_dict.dstorage)
+ ## l = len(d)
+ ## keys, values = [None] * l, [None] * l
+ ## i = 0
+ ## for key, val in d.iteritems():
+ ## keys[i] = key
+ ## values[i] = val
+ ## i += 1
+ ## return keys, values
+
+create_iterator_classes(UnicodeDictStrategy)
+
+
class IntDictStrategy(AbstractTypedStrategy, DictStrategy):
erase, unerase = rerased.new_erasing_pair("int")
erase = staticmethod(erase)
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
@@ -29,6 +29,7 @@
from pypy.objspace.std.sliceobject import W_SliceObject
from pypy.objspace.std.smallintobject import W_SmallIntObject
from pypy.objspace.std.stringobject import W_StringObject
+from pypy.objspace.std.unicodeobject import W_UnicodeObject
from pypy.objspace.std.tupleobject import W_AbstractTupleObject
from pypy.objspace.std.typeobject import W_TypeObject
@@ -52,6 +53,8 @@
self.StringObjectCls = W_RopeObject
else:
self.StringObjectCls = W_StringObject
+
+ self.UnicodeObjectCls = W_UnicodeObject
self._install_multimethods()
diff --git a/pypy/objspace/std/test/test_dictmultiobject.py
b/pypy/objspace/std/test/test_dictmultiobject.py
--- a/pypy/objspace/std/test/test_dictmultiobject.py
+++ b/pypy/objspace/std/test/test_dictmultiobject.py
@@ -3,7 +3,7 @@
from pypy.interpreter.error import OperationError
from pypy.objspace.std.dictmultiobject import \
W_DictMultiObject, setitem__DictMulti_ANY_ANY, getitem__DictMulti_ANY, \
- StringDictStrategy, ObjectDictStrategy, UnicodeDictStrategy
+ StringDictStrategy, ObjectDictStrategy
from pypy.conftest import gettestobjspace
from pypy.conftest import option
@@ -799,6 +799,16 @@
o.a = 1
assert "StringDictStrategy" in self.get_strategy(d)
+ def test_empty_to_unicode(self):
+ d = {}
+ assert "EmptyDictStrategy" in self.get_strategy(d)
+ d[u"a"] = 1
+ assert "UnicodeDictStrategy" in self.get_strategy(d)
+ assert d[u"a"] == 1
+ assert d["a"] == 1
+ assert d.keys() == [u"a"]
+ assert type(d.keys()[0]) is unicode
+
def test_empty_to_int(self):
import sys
d = {}
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
