Author: Matti Picus <[email protected]>
Branch: mro-reorder-numpypy-str
Changeset: r65883:30146f8b14a7
Date: 2013-08-01 18:07 +0300
http://bitbucket.org/pypy/pypy/changeset/30146f8b14a7/
Log: reorder mro for numpypy string_
diff --git a/pypy/module/micronumpy/interp_boxes.py
b/pypy/module/micronumpy/interp_boxes.py
--- a/pypy/module/micronumpy/interp_boxes.py
+++ b/pypy/module/micronumpy/interp_boxes.py
@@ -379,7 +379,10 @@
return self
class W_CharacterBox(W_FlexibleBox):
- pass
+ def convert_to(self, dtype):
+ # XXX assert dtype is str type
+ return self
+
class W_StringBox(W_CharacterBox):
def descr__new__string_box(space, w_subtype, w_arg):
@@ -684,12 +687,12 @@
__module__ = "numpypy",
)
-W_StringBox.typedef = TypeDef("string_", (str_typedef, W_CharacterBox.typedef),
+W_StringBox.typedef = TypeDef("string_", (W_CharacterBox.typedef, str_typedef),
__module__ = "numpypy",
__new__ = interp2app(W_StringBox.descr__new__string_box.im_func),
)
-W_UnicodeBox.typedef = TypeDef("unicode_", (unicode_typedef,
W_CharacterBox.typedef),
+W_UnicodeBox.typedef = TypeDef("unicode_", (W_CharacterBox.typedef,
unicode_typedef),
__module__ = "numpypy",
__new__ = interp2app(W_UnicodeBox.descr__new__unicode_box.im_func),
)
diff --git a/pypy/module/micronumpy/interp_dtype.py
b/pypy/module/micronumpy/interp_dtype.py
--- a/pypy/module/micronumpy/interp_dtype.py
+++ b/pypy/module/micronumpy/interp_dtype.py
@@ -234,6 +234,9 @@
def is_record_type(self):
return self.fields is not None
+ def is_str_type(self):
+ return self.num == 18
+
def is_str_or_unicode(self):
return (self.num == 18 or self.num == 19)
diff --git a/pypy/module/micronumpy/interp_ufuncs.py
b/pypy/module/micronumpy/interp_ufuncs.py
--- a/pypy/module/micronumpy/interp_ufuncs.py
+++ b/pypy/module/micronumpy/interp_ufuncs.py
@@ -328,7 +328,11 @@
w_out = None
w_lhs = convert_to_array(space, w_lhs)
w_rhs = convert_to_array(space, w_rhs)
- if (w_lhs.get_dtype().is_flexible_type() or \
+ if w_lhs.get_dtype().is_str_type() and \
+ w_rhs.get_dtype().is_str_type() and \
+ self.comparison_func:
+ pass
+ elif (w_lhs.get_dtype().is_flexible_type() or \
w_rhs.get_dtype().is_flexible_type()):
raise OperationError(space.w_TypeError, space.wrap(
'unsupported operand dtypes %s and %s for "%s"' % \
diff --git a/pypy/module/micronumpy/types.py b/pypy/module/micronumpy/types.py
--- a/pypy/module/micronumpy/types.py
+++ b/pypy/module/micronumpy/types.py
@@ -1689,6 +1689,22 @@
def get_size(self):
return self.size
+def str_unary_op(func):
+ specialize.argtype(1)(func)
+ @functools.wraps(func)
+ def dispatcher(self, v1):
+ return func(self, self.to_str(v1))
+ return dispatcher
+
+def str_binary_op(func):
+ specialize.argtype(1, 2)(func)
+ @functools.wraps(func)
+ def dispatcher(self, v1, v2):
+ return func(self,
+ self.to_str(v1),
+ self.to_str(v2)
+ )
+ return dispatcher
class StringType(BaseType, BaseStringType):
T = lltype.Char
@@ -1697,6 +1713,7 @@
def coerce(self, space, dtype, w_item):
from pypy.module.micronumpy.interp_dtype import new_string_dtype
arg = space.str_w(space.str(w_item))
+ print 'coerce "%s"' %arg
arr = VoidBoxStorage(len(arg), new_string_dtype(space, len(arg)))
for i in range(len(arg)):
arr.storage[i] = arg[i]
@@ -1734,10 +1751,53 @@
builder.append("'")
return builder.build()
- # XXX move to base class when UnicodeType is supported
+ # XXX move the rest of this to base class when UnicodeType is supported
def to_builtin_type(self, space, box):
return space.wrap(self.to_str(box))
+ @str_binary_op
+ def eq(self, v1, v2):
+ return v1 == v2
+
+ @str_binary_op
+ def ne(self, v1, v2):
+ return v1 != v2
+
+ @str_binary_op
+ def lt(self, v1, v2):
+ return v1 < v2
+
+ @str_binary_op
+ def le(self, v1, v2):
+ return v1 <= v2
+
+ @str_binary_op
+ def gt(self, v1, v2):
+ return v1 > v2
+
+ @str_binary_op
+ def ge(self, v1, v2):
+ return v1 >= v2
+
+ @str_binary_op
+ def logical_and(self, v1, v2):
+ return bool(v1) and bool(v2)
+
+ @str_binary_op
+ def logical_or(self, v1, v2):
+ return bool(v1) or bool(v2)
+
+ @str_unary_op
+ def logical_not(self, v):
+ return not bool(v)
+
+ @str_binary_op
+ def logical_xor(self, v1, v2):
+ return bool(v1) ^ bool(v2)
+
+ def bool(self, v):
+ return bool(self.to_str(v))
+
def build_and_convert(self, space, mydtype, box):
assert isinstance(box, interp_boxes.W_GenericBox)
if box.get_dtype(space).is_str_or_unicode():
@@ -1753,6 +1813,13 @@
arr.storage[j] = '\x00'
return interp_boxes.W_StringBox(arr, 0, arr.dtype)
+NonNativeStringType = StringType
+
+class UnicodeType(BaseType, BaseStringType):
+ T = lltype.UniChar
+
+NonNativeUnicodeType = UnicodeType
+
class VoidType(BaseType, BaseStringType):
T = lltype.Char
@@ -1798,12 +1865,6 @@
return W_NDimArray(implementation)
NonNativeVoidType = VoidType
-NonNativeStringType = StringType
-
-class UnicodeType(BaseType, BaseStringType):
- T = lltype.UniChar
-
-NonNativeUnicodeType = UnicodeType
class RecordType(BaseType):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
