[Numpy-svn] r5871 - branches/clean_math_config_chuck/numpy/core/src

numpy-svn@scip... numpy-svn@scip...
Sun Sep 28 15:06:02 CDT 2008


Author: charris
Date: 2008-09-28 15:06:00 -0500 (Sun, 28 Sep 2008)
New Revision: 5871

Modified:
   branches/clean_math_config_chuck/numpy/core/src/umathmodule.c.src
Log:
Work in progress.

Modified: branches/clean_math_config_chuck/numpy/core/src/umathmodule.c.src
===================================================================
--- branches/clean_math_config_chuck/numpy/core/src/umathmodule.c.src	2008-09-28 20:05:10 UTC (rev 5870)
+++ branches/clean_math_config_chuck/numpy/core/src/umathmodule.c.src	2008-09-28 20:06:00 UTC (rev 5871)
@@ -596,7 +596,7 @@
 
 /**begin repeat2
  * Arithmetic
- * #kind = add, subtract, multiply, bitwise_and, bitwise_or, bitwise_xor
+ * #kind = add, subtract, multiply, bitwise_and, bitwise_or, bitwise_xor,
  *          left_shift, right_shift#
  * #OP = +, -,*, &, |, ^, <<, >>#
  */
@@ -635,7 +635,7 @@
         const @s@@type@ in2 = *(@s@@type@ *)ip2;
         if (in2 == 0) {
             generate_divbyzero_error();
-            *((@otype@ *)op) = 0;
+            *((@ftype@ *)op) = 0;
         }
         else {
             *((@ftype@ *)op) = (@ftype@)in1 / (@ftype@)in2;
@@ -652,7 +652,6 @@
         *((@s@@type@ *)op) = (@s@@type@) pow(in1, in2);
     }
 }
-
 /**end repeat1**/
 
 static void
@@ -745,9 +744,9 @@
 /**end repeat1**/
 
 /**begin repeat1
- * kind = less, less_equal, greater, greater_equal, equal, not_equal,
- * logical_and, logical_or#
- * OP = <, <=, >, >=, ==, !=, &&, ||#
+ * #kind = less, less_equal, greater, greater_equal, equal, not_equal,
+ *        logical_and, logical_or#
+ * #OP = <, <=, >, >=, ==, !=, &&, ||#
  */
 static void
 @TYPE@_@kind@(char **args, intp *dimensions, intp *steps, void *func)
@@ -1053,6 +1052,7 @@
                 ((c@type@ *)i2)->real;
     }
 }
+/**end repeat1**/
 
 static void
 @CTYPE@_logical_not(char **args, intp *dimensions, intp *steps, void *func)
@@ -1066,8 +1066,6 @@
     }
 }
 
-/**end repeat1**/
-
 #define @CTYPE@_true_divide @CTYPE@_divide
 /**end repeat**/
 



More information about the Numpy-svn mailing list