Author: Brian Kearns <[email protected]>
Branch:
Changeset: r61110:eea9453b9339
Date: 2013-02-11 19:49 -0500
http://bitbucket.org/pypy/pypy/changeset/eea9453b9339/
Log: some cleanups and a test for numpypy longdouble aliases
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
@@ -482,10 +482,8 @@
name="float96",
char="g",
w_box_type=space.gettypefor(interp_boxes.W_Float96Box),
- aliases=["longfloat", "longdouble"],
+ aliases=["longdouble", "longfloat"],
)
- self.w_longdouble = self.w_float96dtype
-
self.w_complex192dtype = W_ComplexDtype(
types.Complex192(),
num=16,
@@ -497,8 +495,8 @@
aliases=["clongdouble", "clongfloat"],
float_type = self.w_float96dtype,
)
+ self.w_longdouble = self.w_float96dtype
self.w_clongdouble = self.w_complex192dtype
-
elif interp_boxes.long_double_size == 16:
self.w_float128dtype = W_Dtype(
types.Float128(),
@@ -507,10 +505,8 @@
name="float128",
char="g",
w_box_type=space.gettypefor(interp_boxes.W_Float128Box),
- aliases=["longfloat", "longdouble"],
+ aliases=["longdouble", "longfloat"],
)
- self.w_longdouble = self.w_float128dtype
-
self.w_complex256dtype = W_ComplexDtype(
types.Complex256(),
num=16,
@@ -522,11 +518,13 @@
aliases=["clongdouble", "clongfloat"],
float_type = self.w_float128dtype,
)
+ self.w_longdouble = self.w_float128dtype
self.w_clongdouble = self.w_complex256dtype
else:
- self.w_float64dtype.aliases += ["longfloat", "longdouble"]
+ self.w_float64dtype.aliases += ["longdouble", "longfloat"]
+ self.w_complex128dtype.aliases += ["clongdouble", "clongfloat"]
self.w_longdouble = self.w_float64dtype
- self.w_clongdouble = self.w_complex64dtype
+ self.w_clongdouble = self.w_complex128dtype
self.w_stringdtype = W_Dtype(
types.StringType(1),
num=18,
@@ -605,11 +603,11 @@
self.w_longdtype, self.w_ulongdtype,
self.w_int32dtype, self.w_uint32dtype,
self.w_int64dtype, self.w_uint64dtype,
+ self.w_float16dtype,
self.w_float32dtype, self.w_float64dtype, self.w_longdouble,
self.w_complex64dtype, self.w_complex128dtype, self.w_clongdouble,
self.w_stringdtype, self.w_unicodedtype, self.w_voiddtype,
self.w_intpdtype, self.w_uintpdtype,
- self.w_float16dtype,
]
self.float_dtypes_by_num_bytes = sorted(
(dtype.itemtype.get_element_size(), dtype)
diff --git a/pypy/module/micronumpy/test/test_dtypes.py
b/pypy/module/micronumpy/test/test_dtypes.py
--- a/pypy/module/micronumpy/test/test_dtypes.py
+++ b/pypy/module/micronumpy/test/test_dtypes.py
@@ -39,6 +39,13 @@
raises(TypeError, lambda: dtype("int8") == 3)
assert dtype(bool) == bool
+ def test_dtype_aliases(self):
+ from _numpypy import dtype
+ assert dtype('longfloat').num in (12, 13)
+ assert dtype('longdouble').num in (12, 13)
+ assert dtype('clongfloat').num in (15, 16)
+ assert dtype('clongdouble').num in (15, 16)
+
def test_dtype_with_types(self):
from _numpypy import dtype
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
