# HG changeset patch
# User Jaroslav Hajek <highegg@gmail.com>
# Date 1244798885 -7200
# Node ID c0b104835d0db77a75edee87e4c6c18870b64a51
# Parent  650c7efa7234b66237511a70d9a6fbde2b5205a8
allow multiple arguments in plus,times,mtimes,and,or

diff -r 650c7efa7234 -r c0b104835d0d src/ChangeLog
--- a/src/ChangeLog	Fri Jun 12 10:42:36 2009 +0200
+++ b/src/ChangeLog	Fri Jun 12 11:28:05 2009 +0200
@@ -1,3 +1,8 @@
+2009-06-12  Jaroslav Hajek  <highegg@gmail.com>
+
+	* data.cc (BINARY_ASSOC_OP_DEFUN_BODY): New helper macro.
+	(Fplus, Fmtimes, Ftimes, Fand, For): Allow >= 1 arguments.
+
 2009-06-12  Jaroslav Hajek  <highegg@gmail.com>
 
 	* ov-cell.cc (octave_cell::sort (Array<octave_idx_type>&)): Simplify.
diff -r 650c7efa7234 -r c0b104835d0d src/data.cc
--- a/src/data.cc	Fri Jun 12 10:42:36 2009 +0200
+++ b/src/data.cc	Fri Jun 12 11:28:05 2009 +0200
@@ -5075,13 +5075,39 @@
  \
   return retval
 
+#define BINARY_ASSOC_OP_DEFUN_BODY(F) \
+ \
+  octave_value retval; \
+  octave_idx_type nargin = args.length (); \
+ \
+  if (nargin >= 1) \
+    { \
+      retval = args (0); \
+      for (octave_idx_type i = 1; i < nargin; i++) \
+        retval = F (retval, args(i)); \
+    } \
+  else \
+    print_usage (); \
+ \
+  return retval
+
+
 DEFUN (plus, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} plus (@var{x}, @var{y})\n\
+@deftypefnx {Built-in Function} {} plus (@var{x1}, @var{x2}, @dots{})\n\
 This function is equivalent to @code{x + y}.\n\
+If more arguments are given, the summation is applied\n\
+cumulatively from left to right:\n\
+\n\
+@example\n\
+  (@dots{}((x1 + x2) + x3) + @dots{})\n\
+@end example\n\
+\n\
+At least one argument is needed.\n\
 @end deftypefn")
 {
-  BINARY_OP_DEFUN_BODY (op_add);
+  BINARY_ASSOC_OP_DEFUN_BODY (op_add);
 }
 
 DEFUN (minus, args, ,
@@ -5096,10 +5122,19 @@
 DEFUN (mtimes, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} mtimes (@var{x}, @var{y})\n\
+@deftypefnx {Built-in Function} {} mtimes (@var{x1}, @var{x2}, @dots{})\n\
 This function is equivalent to @code{x * y}.\n\
+If more arguments are given, the multiplication is applied\n\
+cumulatively from left to right:\n\
+\n\
+@example\n\
+  (@dots{}((x1 * x2) * x3) * @dots{})\n\
+@end example\n\
+\n\
+At least one argument is needed.\n\
 @end deftypefn")
 {
-  BINARY_OP_DEFUN_BODY (op_mul);
+  BINARY_ASSOC_OP_DEFUN_BODY (op_mul);
 }
 
 DEFUN (mrdivide, args, ,
@@ -5186,10 +5221,19 @@
 DEFUN (times, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} times (@var{x}, @var{y})\n\
+@deftypefnx {Built-in Function} {} times (@var{x1}, @var{x2}, @dots{})\n\
 This function is equivalent to @code{x .* y}.\n\
+If more arguments are given, the multiplication is applied\n\
+cumulatively from left to right:\n\
+\n\
+@example\n\
+  (@dots{}((x1 .* x2) .* x3) .* @dots{})\n\
+@end example\n\
+\n\
+At least one argument is needed.\n\
 @end deftypefn")
 {
-  BINARY_OP_DEFUN_BODY (op_el_mul);
+  BINARY_ASSOC_OP_DEFUN_BODY (op_el_mul);
 }
 
 DEFUN (rdivide, args, ,
@@ -5222,19 +5266,37 @@
 DEFUN (and, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} and (@var{x}, @var{y})\n\
+@deftypefnx {Built-in Function} {} and (@var{x1}, @var{x2}, @dots{})\n\
 This function is equivalent to @code{x & y}.\n\
+If more arguments are given, the logical and is applied\n\
+cumulatively from left to right:\n\
+\n\
+@example\n\
+  (@dots{}((x1 & x2) & x3) & @dots{})\n\
+@end example\n\
+\n\
+At least one argument is needed.\n\
 @end deftypefn")
 {
-  BINARY_OP_DEFUN_BODY (op_el_and);
+  BINARY_ASSOC_OP_DEFUN_BODY (op_el_and);
 }
 
 DEFUN (or, args, ,
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} or (@var{x}, @var{y})\n\
+@deftypefnx {Built-in Function} {} or (@var{x1}, @var{x2}, @dots{})\n\
 This function is equivalent to @code{x | y}.\n\
+If more arguments are given, the logical or is applied\n\
+cumulatively from left to right:\n\
+\n\
+@example\n\
+  (@dots{}((x1 | x2) | x3) | @dots{})\n\
+@end example\n\
+\n\
+At least one argument is needed.\n\
 @end deftypefn")
 {
-  BINARY_OP_DEFUN_BODY (op_el_or);
+  BINARY_ASSOC_OP_DEFUN_BODY (op_el_or);
 }
 
 static double tic_toc_timestamp = -1.0;