diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2008-07-12 05:17:43 +0000 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2008-07-12 05:17:43 +0000 |
| commit | b81c073daf1f5d45441b30b6a792a8348f6a572f (patch) | |
| tree | e55f075e8e5949cd72a717850fb2df8d6a636a2b /numpy | |
| parent | 6f7d69ae4718de29b37f54abcfed44015ae57d97 (diff) | |
| download | numpy-b81c073daf1f5d45441b30b6a792a8348f6a572f.tar.gz | |
Small cleanups.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/scalartypes.inc.src | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/numpy/core/src/scalartypes.inc.src b/numpy/core/src/scalartypes.inc.src index 680a5eca8..ae9c6190f 100644 --- a/numpy/core/src/scalartypes.inc.src +++ b/numpy/core/src/scalartypes.inc.src @@ -551,11 +551,10 @@ gentype_repr(PyObject *self) return ret; } /**begin repeat - -#name=float, double, longdouble# -#NAME=FLOAT, DOUBLE, LONGDOUBLE# -#PREFIX=NPY_,NPY_,NPY_# -*/ + * #name=float, double, longdouble# + * #NAME=FLOAT, DOUBLE, LONGDOUBLE# + * #PREFIX=NPY_,NPY_,NPY_# + */ static void format_@name@(char *buf, size_t buflen, @name@ val, unsigned int precision) @@ -640,8 +639,9 @@ static PyObject * @name@type_@kind@(PyObject *self) { static char buf[100]; - format_@name@(buf, sizeof(buf), - ((Py@Name@ScalarObject *)self)->obval, @NAME@PREC_@KIND@); + @name@ x = ((Py@Name@ScalarObject *)self)->obval; + + format_@name@(buf, sizeof(buf), x, @NAME@PREC_@KIND@); return PyString_FromString(buf); } @@ -651,11 +651,10 @@ c@name@type_@kind@(PyObject *self) static char buf1[100]; static char buf2[100]; static char buf3[202]; - c@name@ x; - x = ((PyC@Name@ScalarObject *)self)->obval; + c@name@ x = ((PyC@Name@ScalarObject *)self)->obval; + format_@name@(buf1, sizeof(buf1), x.real, @NAME@PREC_@KIND@); format_@name@(buf2, sizeof(buf2), x.imag, @NAME@PREC_@KIND@); - snprintf(buf3, sizeof(buf3), "(%s+%sj)", buf1, buf2); return PyString_FromString(buf3); } @@ -2696,8 +2695,8 @@ ComplexFloating, Flexible, Character# PyCLongDoubleArrType_Type.tp_as_number = &clongdoubletype_as_number; /**begin repeat -#name=int, long, hex, oct, float, repr, str# -#kind=tp_as_number->nb*5, tp*2# + * #name=int, long, hex, oct, float, repr, str# + * #kind=tp_as_number->nb*5, tp*2# */ PyLongDoubleArrType_Type.@kind@_@name@ = longdoubletype_@name@; PyCLongDoubleArrType_Type.@kind@_@name@ = clongdoubletype_@name@; |