Author: Justin Peel <notmuchtot...@gmail.com>
Branch: numpy-dtype
Changeset: r46715:48a26861a1ac
Date: 2011-08-22 01:17 -0600
http://bitbucket.org/pypy/pypy/changeset/48a26861a1ac/
Log: Added in Int64 and fixed a typo.
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
@@ -183,7 +183,7 @@
#UInt8_dtype = make_dtype(r_uchar, lltype.Array(rffi.UCHAR, hints={'nolength':
True}),
# 'uint8', conv_int, cast_uint8, unwrap_int, UInt8_num, UNSIGNEDLTR)
#Int16_dtype = make_dtype(r_short, lltype.Array(rffi.SHORT, hints={'nolength':
True}),
- 'int16', conv_int, cast_int16, unwrap_int, Int16_num, SIGNEDLTR)
+# 'int16', conv_int, cast_int16, unwrap_int, Int16_num, SIGNEDLTR)
#UInt16_dtype = make_dtype(r_ushort, lltype.Array(rffi.USHORT,
hints={'nolength': True}),
# 'uint16', conv_int, cast_uint16, unwrap_int, UInt16_num, UNSIGNEDLTR)
Int32_dtype = make_dtype(r_int, lltype.Array(rffi.INT, hints={'nolength':
True}),
@@ -199,9 +199,9 @@
#unwrap_ubigint if LONG_BIT == 32 else unwrap_int,
#ULong_num, UNSIGNEDLTR)
-#Int64_dtype = make_dtype(r_longlong, lltype.Array(rffi.LONGLONG,
hints={'nolength': True}),
-# 'int64', conv_int, cast_int64,
-# unwrap_bigint if LONG_BIT == 32 else unwrap_bigint, Int64_num, SIGNEDLTR)
+Int64_dtype = make_dtype(r_longlong, lltype.Array(rffi.LONGLONG,
hints={'nolength': True}),
+ 'int64', conv_int, cast_int64,
+ unwrap_bigint if LONG_BIT == 32 else unwrap_bigint, Int64_num, SIGNEDLTR)
#UInt64_dtype = make_dtype(r_ulonglong, lltype.Array(rffi.ULONGLONG,
hints={'nolength': True}),
# 'uint64', conv_int, cast_uint64, unwrap_ubigint, UInt64_num, UNSIGNEDLTR)
#Float32_dtype = make_dtype('float32', conv_float, cast_float32, unwrap_float,
Float32_num, FLOATINGLTR)
@@ -213,11 +213,10 @@
Float96_dtype = Float64_dtype
Int8_dtype = Int32_dtype
UInt8_dtype = Int32_dtype
-#Int16_dtype = Int32_dtype
+Int16_dtype = Int32_dtype
UInt16_dtype = Int32_dtype
UInt32_dtype = Int32_dtype
ULong_dtype = Int32_dtype
-Int64_dtype = Int32_dtype
UInt64_dtype = Int32_dtype
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
