Mercurial > octave-libgccjit
changeset 9931:fb6b6fcafa62
untabify files in src/OPERATORS directory
line wrap: on
line diff
--- a/src/ChangeLog Mon Dec 07 13:17:13 2009 -0500 +++ b/src/ChangeLog Mon Dec 07 14:49:48 2009 -0500 @@ -1,3 +1,20 @@ +2009-12-07 John W. Eaton <jwe@octave.org> + + * op-pm-sm.cc, op-pm-scm.cc, op-dm-sm.cc, op-dm-scm.cc, + op-fs-fm.cc, op-fs-fcm.cc, op-fs-fcs.cc, op-fm-fm.cc, + op-fm-fcs.cc, op-fm-fcm.cc, op-fcs-fs.cc, op-fcs-fm.cc, + op-fcs-fcm.cc, op-fcm-fs.cc, op-fcm-fm.cc, op-fm-fs.cc, + op-fcm-fcm.cc, op-class.cc, op-fcm-fcs.cc, op-str-str.cc, + op-str-s.cc, op-str-m.cc, op-struct.cc, op-sm-scm.cc, op-sm-s.cc, + op-sm-sm.cc, op-sm-cs.cc, op-sm-cm.cc, op-scm-sm.cc, + op-scm-scm.cc, op-scm-s.cc, op-scm-m.cc, op-scm-cs.cc, op-sm-m.cc, + op-sbm-sbm.cc, op-scm-cm.cc, op-sbm-bm.cc, op-s-sm.cc, + op-s-scm.cc, op-sbm-b.cc, op-m-scm.cc, op-m-sm.cc, op-m-cm.cc, + op-int.h, op-int-conv.cc, op-int-concat.cc, op-cs-sm.cc, + op-cs-scm.cc, op-cm-sm.cc, op-cs-cs.cc, op-cm-m.cc, op-cm-scm.cc, + op-cm-cm.cc, op-chm.cc, op-cell.cc, op-bm-sbm.cc, op-bm-bm.cc, + op-bm-b.cc, op-b-sbm.cc, op-fcs-fcs.cc: Untabify. + 2009-12-07 Jaroslav Hajek <highegg@gmail.com> * Makefile.am: Build OPT_HANDLERS before DEF_FILES.
--- a/src/OPERATORS/op-b-sbm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-b-sbm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2007, 2008 David Bateman +Copyright (C) 2004, 2005, 2007, 2008, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -50,7 +50,7 @@ CAST_BINOP_ARGS (octave_bool&, const octave_sparse_bool_matrix&); SparseBoolMatrix tmp (1, 1, v1.bool_value ()); return octave_value (tmp. concat (v2.sparse_bool_matrix_value (), - ra_idx)); + ra_idx)); } DEFCATOP (b_sm, bool, sparse_matrix) @@ -89,7 +89,7 @@ INSTALL_CATOP (octave_scalar, octave_sparse_bool_matrix, s_sbm); INSTALL_ASSIGNCONV (octave_bool, octave_sparse_bool_matrix, - octave_bool_matrix); + octave_bool_matrix); INSTALL_WIDENOP (octave_bool, octave_sparse_bool_matrix, sparse_bool_matrix_conv); }
--- a/src/OPERATORS/op-bm-b.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-bm-b.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,7 @@ /* -Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Cai Jianming +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 + Cai Jianming This file is part of Octave. @@ -65,8 +66,8 @@ static octave_value oct_assignop_conv_and_assign (octave_base_value& a1, - const octave_value_list& idx, - const octave_base_value& a2) + const octave_value_list& idx, + const octave_base_value& a2) { octave_bool_matrix& v1 = dynamic_cast<octave_bool_matrix&> (a1);
--- a/src/OPERATORS/op-bm-bm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-bm-bm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 John W. Eaton + 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -76,22 +76,22 @@ DEFNDBINOP_FN (ne, bool_matrix, bool_matrix, bool_array, bool_array, mx_el_ne) DEFNDBINOP_FN (el_and, bool_matrix, bool_matrix, bool_array, bool_array, - mx_el_and) + mx_el_and) DEFNDBINOP_FN (el_or, bool_matrix, bool_matrix, bool_array, bool_array, - mx_el_or) + mx_el_or) DEFNDBINOP_FN (el_not_and, bool_matrix, bool_matrix, bool_array, bool_array, - mx_el_not_and) + mx_el_not_and) DEFNDBINOP_FN (el_not_or, bool_matrix, bool_matrix, bool_array, bool_array, - mx_el_not_or) + mx_el_not_or) DEFNDBINOP_FN (el_and_not, bool_matrix, bool_matrix, bool_array, bool_array, - mx_el_and_not) + mx_el_and_not) DEFNDBINOP_FN (el_or_not, bool_matrix, bool_matrix, bool_array, bool_array, - mx_el_or_not) + mx_el_or_not) DEFNDCATOP_FN (bm_bm, bool_matrix, bool_matrix, bool_array, bool_array, concat) DEFNDCATOP_FN (bm_m, bool_matrix, matrix, array, array, concat) @@ -107,8 +107,8 @@ static octave_value oct_assignop_conv_and_assign (octave_base_value& a1, - const octave_value_list& idx, - const octave_base_value& a2) + const octave_value_list& idx, + const octave_base_value& a2) { octave_bool_matrix& v1 = dynamic_cast<octave_bool_matrix&> (a1);
--- a/src/OPERATORS/op-bm-sbm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-bm-sbm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2007, 2008 David Bateman +Copyright (C) 2004, 2005, 2007, 2008, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -52,7 +52,7 @@ CAST_BINOP_ARGS (octave_bool_matrix&, const octave_sparse_bool_matrix&); SparseBoolMatrix tmp (v1.bool_matrix_value ()); return octave_value (tmp. concat (v2.sparse_bool_matrix_value (), - ra_idx)); + ra_idx)); } DEFCATOP (m_sbm, matrix, sparse_bool_matrix) @@ -85,21 +85,21 @@ INSTALL_BINOP (op_ne, octave_bool_matrix, octave_sparse_bool_matrix, ne); INSTALL_BINOP (op_el_and, octave_bool_matrix, octave_sparse_bool_matrix, - el_and); + el_and); INSTALL_BINOP (op_el_or, octave_bool_matrix, octave_sparse_bool_matrix, - el_or); + el_or); INSTALL_CATOP (octave_bool_matrix, octave_sparse_bool_matrix, bm_sbm); INSTALL_CATOP (octave_bool_matrix, octave_sparse_matrix, bm_sm); INSTALL_CATOP (octave_matrix, octave_sparse_bool_matrix, m_sbm); INSTALL_ASSIGNOP (op_asn_eq, octave_bool_matrix, octave_sparse_bool_matrix, - assign) + assign) INSTALL_ASSIGNCONV (octave_bool_matrix, octave_sparse_bool_matrix, - octave_bool_matrix); + octave_bool_matrix); INSTALL_WIDENOP (octave_bool_matrix, octave_sparse_bool_matrix, - sparse_bool_matrix_conv); + sparse_bool_matrix_conv); } /*
--- a/src/OPERATORS/op-cell.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-cell.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,7 @@ /* -Copyright (C) 1996, 1997, 2002, 2003, 2004, 2005, 2007, 2008 John W. Eaton +Copyright (C) 1996, 1997, 2002, 2003, 2004, 2005, 2007, 2008, 2009 + John W. Eaton This file is part of Octave. @@ -53,7 +54,7 @@ static octave_value oct_catop_cell_matrix (octave_base_value& a1, const octave_base_value& a2, - const Array<octave_idx_type>&) + const Array<octave_idx_type>&) { octave_value retval; CAST_BINOP_ARGS (const octave_cell&, const octave_matrix&); @@ -68,7 +69,7 @@ static octave_value oct_catop_matrix_cell (octave_base_value& a1, const octave_base_value& a2, - const Array<octave_idx_type>&) + const Array<octave_idx_type>&) { octave_value retval; CAST_BINOP_ARGS (const octave_matrix&, const octave_cell&);
--- a/src/OPERATORS/op-chm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-chm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996, 1997, 1998, 2000, 2002, 2004, 2005, 2006, 2007 +Copyright (C) 1996, 1997, 1998, 2000, 2002, 2004, 2005, 2006, 2007, 2009 John W. Eaton This file is part of Octave. @@ -46,17 +46,17 @@ } DEFNDCATOP_FN (chm_chm, char_matrix, char_matrix, char_array, char_array, - concat) + concat) DEFCATOP (chm_s, char_matrix, scalar) { CAST_BINOP_ARGS (octave_char_matrix&, const octave_scalar&); gripe_implicit_conversion ("Octave:num-to-str", - v2.type_name (), v1.type_name ()); + v2.type_name (), v1.type_name ()); return octave_value (v1.char_array_value (). concat(v2.array_value (), - ra_idx)); + ra_idx)); } DEFCATOP (chm_m, char_matrix, matrix) @@ -64,10 +64,10 @@ CAST_BINOP_ARGS (octave_char_matrix&, const octave_matrix&); gripe_implicit_conversion ("Octave:num-to-str", - v2.type_name (), v1.type_name ()); + v2.type_name (), v1.type_name ()); return octave_value (v1.char_array_value (). concat (v2.array_value (), - ra_idx)); + ra_idx)); } DEFCATOP (s_chm, scalar, char_matrix) @@ -75,10 +75,10 @@ CAST_BINOP_ARGS (octave_scalar&, const octave_char_matrix&); gripe_implicit_conversion ("Octave:num-to-str", - v1.type_name (), v2.type_name ()); + v1.type_name (), v2.type_name ()); return octave_value (v1.array_value (). concat (v2.char_array_value (), - ra_idx)); + ra_idx)); } DEFCATOP (m_chm, matrix, char_matrix) @@ -86,10 +86,10 @@ CAST_BINOP_ARGS (octave_matrix&, const octave_char_matrix&); gripe_implicit_conversion ("Octave:num-to-str", - v1.type_name (), v2.type_name ()); + v1.type_name (), v2.type_name ()); return octave_value (v1.array_value (). concat (v2.char_array_value (), - ra_idx)); + ra_idx)); } void
--- a/src/OPERATORS/op-class.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-class.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2007, 2008 John W. Eaton +Copyright (C) 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -50,14 +50,14 @@ \ if (meth.is_defined ()) \ { \ - octave_value_list args; \ + octave_value_list args; \ \ - args(0) = a; \ + args(0) = a; \ \ - octave_value_list tmp = feval (meth.function_value (), args, 1); \ + octave_value_list tmp = feval (meth.function_value (), args, 1); \ \ - if (tmp.length () > 0) \ - retval = tmp(0); \ + if (tmp.length () > 0) \ + retval = tmp(0); \ } \ else \ error ("%s method not defined for %s class", \ @@ -87,15 +87,15 @@ \ if (meth.is_defined ()) \ { \ - octave_value_list args; \ + octave_value_list args; \ \ - args(1) = a2; \ - args(0) = a1; \ + args(1) = a2; \ + args(0) = a1; \ \ - octave_value_list tmp = feval (meth.function_value (), args, 1); \ + octave_value_list tmp = feval (meth.function_value (), args, 1); \ \ - if (tmp.length () > 0) \ - retval = tmp(0); \ + if (tmp.length () > 0) \ + retval = tmp(0); \ } \ else \ error ("%s method not defined for %s class", \
--- a/src/OPERATORS/op-cm-cm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-cm-cm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 John W. Eaton + 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -85,7 +85,7 @@ MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (v1.complex_matrix_value (), - v2.complex_matrix_value (), typ); + v2.complex_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -103,7 +103,7 @@ MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), - v2.complex_matrix_value (), typ); + v2.complex_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -147,7 +147,7 @@ MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), - v2.complex_matrix_value (), typ, blas_trans); + v2.complex_matrix_value (), typ, blas_trans); v1.matrix_type (typ); return ret; @@ -159,7 +159,7 @@ MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), - v2.complex_matrix_value (), typ, blas_conj_trans); + v2.complex_matrix_value (), typ, blas_conj_trans); v1.matrix_type (typ); return ret; @@ -257,7 +257,7 @@ INSTALL_ASSIGNOP (op_el_div_eq, octave_complex_matrix, octave_complex_matrix, assign_el_div); INSTALL_CONVOP (octave_complex_matrix, octave_float_complex_matrix, - complex_matrix_to_float_complex_matrix); + complex_matrix_to_float_complex_matrix); } /*
--- a/src/OPERATORS/op-cm-m.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-cm-m.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007 John W. Eaton + 2007, 2009 John W. Eaton This file is part of Octave. @@ -64,7 +64,7 @@ MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (v1.complex_matrix_value (), - v2.matrix_value (), typ); + v2.matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -83,7 +83,7 @@ MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), - v2.matrix_value (), typ); + v2.matrix_value (), typ); v1.matrix_type (typ); return ret;
--- a/src/OPERATORS/op-cm-scm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-cm-scm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007, 2008 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -49,14 +49,14 @@ DEFBINOP (div, complex_matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_complex_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); if (v2.rows() == 1 && v2.columns() == 1) { Complex d = v2.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v1.complex_array_value () / d); } @@ -65,7 +65,7 @@ MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (v1.complex_matrix_value (), - v2.sparse_complex_matrix_value (), typ); + v2.sparse_complex_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -81,11 +81,11 @@ DEFBINOP (ldiv, complex_matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_complex_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), - v2.complex_matrix_value (), typ); + v2.complex_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -107,20 +107,20 @@ DEFBINOP (el_pow, complex_matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_complex_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); return octave_value (elem_xpow (SparseComplexMatrix (v1.complex_matrix_value ()), - v2.sparse_complex_matrix_value ())); + v2.sparse_complex_matrix_value ())); } DEFBINOP (el_ldiv, sparse_complex_matrix, matrix) { CAST_BINOP_ARGS (const octave_complex_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); return octave_value (quotient (v2.sparse_complex_matrix_value (), - v1.complex_matrix_value ())); + v1.complex_matrix_value ())); } DEFBINOP_FN (el_and, complex_matrix, sparse_complex_matrix, mx_el_and) @@ -129,14 +129,14 @@ DEFCATOP (cm_scm, complex_matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (octave_complex_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); SparseComplexMatrix tmp (v1.complex_matrix_value ()); return octave_value (tmp. concat (v2.sparse_complex_matrix_value (), - ra_idx)); + ra_idx)); } DEFCONV (sparse_complex_matrix_conv, complex_matrix, - sparse_complex_matrix) + sparse_complex_matrix) { CAST_CONV_ARG (const octave_complex_matrix&); return new octave_sparse_complex_matrix @@ -144,62 +144,62 @@ } DEFNDASSIGNOP_FN (assign, complex_matrix, sparse_complex_matrix, - complex_array, assign) + complex_array, assign) void install_cm_scm_ops (void) { INSTALL_BINOP (op_add, octave_complex_matrix, - octave_sparse_complex_matrix, add); + octave_sparse_complex_matrix, add); INSTALL_BINOP (op_sub, octave_complex_matrix, - octave_sparse_complex_matrix, sub); + octave_sparse_complex_matrix, sub); INSTALL_BINOP (op_mul, octave_complex_matrix, - octave_sparse_complex_matrix, mul); + octave_sparse_complex_matrix, mul); INSTALL_BINOP (op_div, octave_complex_matrix, - octave_sparse_complex_matrix, div); + octave_sparse_complex_matrix, div); INSTALL_BINOP (op_pow, octave_complex_matrix, - octave_sparse_complex_matrix, pow); + octave_sparse_complex_matrix, pow); INSTALL_BINOP (op_ldiv, octave_complex_matrix, - octave_sparse_complex_matrix, ldiv); + octave_sparse_complex_matrix, ldiv); INSTALL_BINOP (op_mul_trans, octave_complex_matrix, octave_sparse_complex_matrix, mul_trans); INSTALL_BINOP (op_mul_herm, octave_complex_matrix, octave_sparse_complex_matrix, mul_herm); INSTALL_BINOP (op_lt, octave_complex_matrix, - octave_sparse_complex_matrix, lt); + octave_sparse_complex_matrix, lt); INSTALL_BINOP (op_le, octave_complex_matrix, - octave_sparse_complex_matrix, le); + octave_sparse_complex_matrix, le); INSTALL_BINOP (op_eq, octave_complex_matrix, - octave_sparse_complex_matrix, eq); + octave_sparse_complex_matrix, eq); INSTALL_BINOP (op_ge, octave_complex_matrix, - octave_sparse_complex_matrix, ge); + octave_sparse_complex_matrix, ge); INSTALL_BINOP (op_gt, octave_complex_matrix, - octave_sparse_complex_matrix, gt); + octave_sparse_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_complex_matrix, - octave_sparse_complex_matrix, ne); + octave_sparse_complex_matrix, ne); INSTALL_BINOP (op_el_mul, octave_complex_matrix, - octave_sparse_complex_matrix, el_mul); + octave_sparse_complex_matrix, el_mul); INSTALL_BINOP (op_el_div, octave_complex_matrix, - octave_sparse_complex_matrix, el_div); + octave_sparse_complex_matrix, el_div); INSTALL_BINOP (op_el_pow, octave_complex_matrix, - octave_sparse_complex_matrix, el_pow); + octave_sparse_complex_matrix, el_pow); INSTALL_BINOP (op_el_ldiv, octave_complex_matrix, - octave_sparse_complex_matrix, el_ldiv); + octave_sparse_complex_matrix, el_ldiv); INSTALL_BINOP (op_el_and, octave_complex_matrix, - octave_sparse_complex_matrix, el_and); + octave_sparse_complex_matrix, el_and); INSTALL_BINOP (op_el_or, octave_complex_matrix, - octave_sparse_complex_matrix, el_or); + octave_sparse_complex_matrix, el_or); INSTALL_CATOP (octave_complex_matrix, - octave_sparse_complex_matrix, cm_scm); + octave_sparse_complex_matrix, cm_scm); INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, - octave_sparse_complex_matrix, assign) + octave_sparse_complex_matrix, assign) INSTALL_ASSIGNCONV (octave_complex_matrix, octave_sparse_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP (octave_complex_matrix, octave_sparse_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); } /*
--- a/src/OPERATORS/op-cm-sm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-cm-sm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -55,7 +55,7 @@ double d = v2.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v1.complex_array_value () / d); } @@ -64,7 +64,7 @@ MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (v1.complex_matrix_value (), - v2.sparse_matrix_value (), typ); + v2.sparse_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -80,11 +80,11 @@ DEFBINOP (ldiv, complex_matrix, sparse_matrix) { CAST_BINOP_ARGS (const octave_complex_matrix&, - const octave_sparse_matrix&); + const octave_sparse_matrix&); MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.complex_matrix_value (), - v2.matrix_value (), typ); + v2.matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -103,17 +103,17 @@ DEFBINOP (el_pow, complex_matrix, sparse_matrix) { CAST_BINOP_ARGS (const octave_complex_matrix&, - const octave_sparse_matrix&); + const octave_sparse_matrix&); return octave_value (elem_xpow ( SparseComplexMatrix (v1.complex_matrix_value ()), - v2.sparse_matrix_value ())); + v2.sparse_matrix_value ())); } DEFBINOP (el_ldiv, complex_matrix, sparse_matrix) { CAST_BINOP_ARGS (const octave_complex_matrix&, - const octave_sparse_matrix&); + const octave_sparse_matrix&); return octave_value (quotient (v2.sparse_matrix_value (), v1.complex_matrix_value ())); } @@ -146,24 +146,24 @@ INSTALL_BINOP (op_gt, octave_complex_matrix, octave_sparse_matrix, gt); INSTALL_BINOP (op_ne, octave_complex_matrix, octave_sparse_matrix, ne); INSTALL_BINOP (op_el_mul, octave_complex_matrix, octave_sparse_matrix, - el_mul); + el_mul); INSTALL_BINOP (op_el_div, octave_complex_matrix, octave_sparse_matrix, - el_div); + el_div); INSTALL_BINOP (op_el_pow, octave_complex_matrix, octave_sparse_matrix, - el_pow); + el_pow); INSTALL_BINOP (op_el_ldiv, octave_complex_matrix, octave_sparse_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP (op_el_and, octave_complex_matrix, octave_sparse_matrix, - el_and); + el_and); INSTALL_BINOP (op_el_or, octave_complex_matrix, octave_sparse_matrix, - el_or); + el_or); INSTALL_CATOP (octave_complex_matrix, octave_sparse_matrix, cm_sm); INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, octave_sparse_matrix, - assign); + assign); INSTALL_ASSIGNCONV (octave_complex_matrix, octave_sparse_matrix, - octave_complex_matrix) + octave_complex_matrix) }
--- a/src/OPERATORS/op-cs-cs.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-cs-cs.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* -Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2007, 2008 - John W. Eaton +Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2007, + 2008, 2009 John W. Eaton This file is part of Octave. @@ -194,7 +194,7 @@ INSTALL_ASSIGNCONV (octave_complex, octave_null_sq_str, octave_complex_matrix); INSTALL_CONVOP (octave_complex, octave_float_complex_matrix, - complex_to_float_complex); + complex_to_float_complex); } /*
--- a/src/OPERATORS/op-cs-scm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-cs-scm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -53,7 +53,7 @@ Complex d = v2.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (SparseComplexMatrix (1, 1, v1.complex_value () / d)); } @@ -71,7 +71,7 @@ DEFBINOP (pow, complex, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_complex&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); return xpow (v1.complex_value (), v2.complex_matrix_value ()); } @@ -122,7 +122,7 @@ CAST_BINOP_ARGS (octave_complex&, const octave_sparse_complex_matrix&); SparseComplexMatrix tmp (1, 1, v1.complex_value ()); return octave_value (tmp. concat (v2.sparse_complex_matrix_value (), - ra_idx)); + ra_idx)); } DEFCONV (sparse_complex_matrix_conv, complex, sparse_complex_matrix) @@ -142,7 +142,7 @@ INSTALL_BINOP (op_div, octave_complex, octave_sparse_complex_matrix, div); INSTALL_BINOP (op_pow, octave_complex, octave_sparse_complex_matrix, pow); INSTALL_BINOP (op_ldiv, octave_complex, octave_sparse_complex_matrix, - ldiv); + ldiv); INSTALL_BINOP (op_lt, octave_complex, octave_sparse_complex_matrix, lt); INSTALL_BINOP (op_le, octave_complex, octave_sparse_complex_matrix, le); INSTALL_BINOP (op_eq, octave_complex, octave_sparse_complex_matrix, eq); @@ -150,25 +150,25 @@ INSTALL_BINOP (op_gt, octave_complex, octave_sparse_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_complex, octave_sparse_complex_matrix, ne); INSTALL_BINOP (op_el_mul, octave_complex, octave_sparse_complex_matrix, - el_mul); + el_mul); INSTALL_BINOP (op_el_div, octave_complex, octave_sparse_complex_matrix, - el_div); + el_div); INSTALL_BINOP (op_el_pow, octave_complex, octave_sparse_complex_matrix, - el_pow); + el_pow); INSTALL_BINOP (op_el_ldiv, octave_complex, octave_sparse_complex_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP (op_el_and, octave_complex, octave_sparse_complex_matrix, - el_and); + el_and); INSTALL_BINOP (op_el_or, octave_complex, octave_sparse_complex_matrix, - el_or); + el_or); INSTALL_CATOP (octave_complex, octave_sparse_complex_matrix, cs_scm); INSTALL_ASSIGNCONV (octave_complex, octave_sparse_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP (octave_complex, octave_sparse_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); } /*
--- a/src/OPERATORS/op-cs-sm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-cs-sm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -55,7 +55,7 @@ double d = v2.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (SparseComplexMatrix (1, 1, v1.complex_value () / d)); } @@ -160,7 +160,7 @@ INSTALL_CATOP (octave_complex, octave_sparse_matrix, cs_sm); INSTALL_ASSIGNCONV (octave_complex, octave_sparse_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP (octave_complex, octave_sparse_matrix, sparse_matrix_conv); }
--- a/src/OPERATORS/op-dm-scm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-dm-scm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -111,31 +111,31 @@ DEFBINOP (ldiv_dm_scm, diag_matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_diag_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); MatrixType typ = v2.matrix_type (); return xleftdiv (v1.diag_matrix_value (), v2.sparse_complex_matrix_value (), - typ); + typ); } DEFBINOP (ldiv_cdm_sm, complex_diag_matrix, sparse_matrix) { CAST_BINOP_ARGS (const octave_complex_diag_matrix&, - const octave_sparse_matrix&); + const octave_sparse_matrix&); MatrixType typ = v2.matrix_type (); return xleftdiv (v1.complex_diag_matrix_value (), v2.sparse_matrix_value (), - typ); + typ); } DEFBINOP (ldiv_cdm_scm, complex_diag_matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_complex_diag_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); MatrixType typ = v2.matrix_type (); return xleftdiv (v1.complex_diag_matrix_value (), v2.sparse_complex_matrix_value (), - typ); + typ); } DEFBINOP (add_dm_scm, diag_matrix, sparse_complex_matrix) @@ -321,7 +321,7 @@ double d = v2.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v1.sparse_complex_matrix_value () / d); } @@ -341,7 +341,7 @@ std::complex<double> d = v2.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v1.sparse_matrix_value () / d); } @@ -361,7 +361,7 @@ std::complex<double> d = v2.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v1.sparse_complex_matrix_value () / d); } @@ -472,31 +472,31 @@ install_dm_scm_ops (void) { INSTALL_BINOP (op_mul, octave_diag_matrix, octave_sparse_complex_matrix, - mul_dm_scm); + mul_dm_scm); INSTALL_BINOP (op_mul, octave_complex_diag_matrix, octave_sparse_matrix, - mul_cdm_sm); + mul_cdm_sm); INSTALL_BINOP (op_mul, octave_complex_diag_matrix, octave_sparse_complex_matrix, - mul_cdm_scm); + mul_cdm_scm); INSTALL_BINOP (op_ldiv, octave_diag_matrix, octave_sparse_complex_matrix, ldiv_dm_scm); INSTALL_BINOP (op_ldiv, octave_complex_diag_matrix, octave_sparse_matrix, ldiv_cdm_sm); INSTALL_BINOP (op_ldiv, octave_complex_diag_matrix, octave_sparse_complex_matrix, - ldiv_cdm_scm); + ldiv_cdm_scm); INSTALL_BINOP (op_add, octave_diag_matrix, octave_sparse_complex_matrix, add_dm_scm); INSTALL_BINOP (op_add, octave_complex_diag_matrix, octave_sparse_matrix, add_cdm_sm); INSTALL_BINOP (op_add, octave_complex_diag_matrix, octave_sparse_complex_matrix, - add_cdm_scm); + add_cdm_scm); INSTALL_BINOP (op_sub, octave_diag_matrix, octave_sparse_complex_matrix, sub_dm_scm); INSTALL_BINOP (op_sub, octave_complex_diag_matrix, octave_sparse_matrix, sub_cdm_sm); INSTALL_BINOP (op_sub, octave_complex_diag_matrix, octave_sparse_complex_matrix, - sub_cdm_scm); + sub_cdm_scm); INSTALL_BINOP (op_mul, octave_sparse_complex_matrix, octave_diag_matrix, - mul_scm_dm); + mul_scm_dm); INSTALL_BINOP (op_mul, octave_sparse_matrix, octave_complex_diag_matrix, - mul_sm_cdm); + mul_sm_cdm); INSTALL_BINOP (op_mul, octave_sparse_complex_matrix, octave_complex_diag_matrix, - mul_scm_cdm); + mul_scm_cdm); INSTALL_BINOP (op_div, octave_sparse_complex_matrix, octave_diag_matrix, div_scm_dm); INSTALL_BINOP (op_div, octave_sparse_matrix, octave_complex_diag_matrix, div_sm_cdm);
--- a/src/OPERATORS/op-dm-sm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-dm-sm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -134,7 +134,7 @@ double d = v2.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v1.sparse_matrix_value () / d); } @@ -181,14 +181,14 @@ install_dm_sm_ops (void) { INSTALL_BINOP (op_mul, octave_diag_matrix, octave_sparse_matrix, - mul_dm_sm); + mul_dm_sm); INSTALL_BINOP (op_add, octave_diag_matrix, octave_sparse_matrix, add_dm_sm); INSTALL_BINOP (op_sub, octave_diag_matrix, octave_sparse_matrix, sub_dm_sm); INSTALL_BINOP (op_ldiv, octave_diag_matrix, octave_sparse_matrix, ldiv_dm_sm); INSTALL_BINOP (op_mul, octave_sparse_matrix, octave_diag_matrix, - mul_sm_dm); + mul_sm_dm); INSTALL_BINOP (op_add, octave_sparse_matrix, octave_diag_matrix, add_sm_dm); INSTALL_BINOP (op_sub, octave_sparse_matrix, octave_diag_matrix, sub_sm_dm);
--- a/src/OPERATORS/op-fcm-fcm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fcm-fcm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -75,20 +75,20 @@ // complex matrix by complex matrix ops. DEFNDBINOP_OP (add, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, +) + float_complex_array, float_complex_array, +) DEFNDBINOP_OP (sub, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, -) + float_complex_array, float_complex_array, -) DEFBINOP_OP (mul, float_complex_matrix, float_complex_matrix, *) DEFBINOP (div, float_complex_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, - const octave_float_complex_matrix&); + const octave_float_complex_matrix&); MatrixType typ = v2.matrix_type (); FloatComplexMatrix ret = xdiv (v1.float_complex_matrix_value (), - v2.float_complex_matrix_value (), typ); + v2.float_complex_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -103,11 +103,11 @@ DEFBINOP (ldiv, float_complex_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, - const octave_float_complex_matrix&); + const octave_float_complex_matrix&); MatrixType typ = v1.matrix_type (); FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), - v2.float_complex_matrix_value (), typ); + v2.float_complex_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -148,11 +148,11 @@ DEFBINOP (trans_ldiv, float_complex_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, - const octave_float_complex_matrix&); + const octave_float_complex_matrix&); MatrixType typ = v1.matrix_type (); FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), - v2.float_complex_matrix_value (), typ, blas_trans); + v2.float_complex_matrix_value (), typ, blas_trans); v1.matrix_type (typ); return ret; @@ -161,62 +161,62 @@ DEFBINOP (herm_ldiv, float_complex_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, - const octave_float_complex_matrix&); + const octave_float_complex_matrix&); MatrixType typ = v1.matrix_type (); FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), - v2.float_complex_matrix_value (), typ, blas_conj_trans); + v2.float_complex_matrix_value (), typ, blas_conj_trans); v1.matrix_type (typ); return ret; } DEFNDCMPLXCMPOP_FN (lt, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, mx_el_lt) + float_complex_array, float_complex_array, mx_el_lt) DEFNDCMPLXCMPOP_FN (le, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, mx_el_le) + float_complex_array, float_complex_array, mx_el_le) DEFNDCMPLXCMPOP_FN (eq, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, mx_el_eq) + float_complex_array, float_complex_array, mx_el_eq) DEFNDCMPLXCMPOP_FN (ge, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, mx_el_ge) + float_complex_array, float_complex_array, mx_el_ge) DEFNDCMPLXCMPOP_FN (gt, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, mx_el_gt) + float_complex_array, float_complex_array, mx_el_gt) DEFNDCMPLXCMPOP_FN (ne, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, mx_el_ne) + float_complex_array, float_complex_array, mx_el_ne) DEFNDBINOP_FN (el_mul, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, product) + float_complex_array, float_complex_array, product) DEFNDBINOP_FN (el_div, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, quotient) + float_complex_array, float_complex_array, quotient) DEFNDBINOP_FN (el_pow, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, elem_xpow) + float_complex_array, float_complex_array, elem_xpow) DEFBINOP (el_ldiv, float_complex_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, - const octave_float_complex_matrix&); + const octave_float_complex_matrix&); return octave_value (quotient (v2.float_complex_array_value (), v1.float_complex_array_value ())); } DEFNDBINOP_FN (el_and, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, mx_el_and) + float_complex_array, float_complex_array, mx_el_and) DEFNDBINOP_FN (el_or, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, mx_el_or) + float_complex_array, float_complex_array, mx_el_or) DEFNDCATOP_FN (fcm_fcm, float_complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, concat) + float_complex_array, float_complex_array, concat) DEFNDCATOP_FN (cm_fcm, complex_matrix, float_complex_matrix, - float_complex_array, float_complex_array, concat) + float_complex_array, float_complex_array, concat) DEFNDCATOP_FN (fcm_cm, float_complex_matrix, complex_matrix, - float_complex_array, float_complex_array, concat) + float_complex_array, float_complex_array, concat) DEFNDASSIGNOP_FN (assign, float_complex_matrix, float_complex_matrix, - float_complex_array, assign) + float_complex_array, assign) DEFNDASSIGNOP_FN (dbl_assign, float_complex_matrix, complex_matrix, - float_complex_array, assign) + float_complex_array, assign) DEFNULLASSIGNOP_FN (null_assign, float_complex_matrix, delete_elements) @@ -250,17 +250,17 @@ INSTALL_NCUNOP (op_uminus, octave_float_complex_matrix, changesign); INSTALL_BINOP (op_add, octave_float_complex_matrix, - octave_float_complex_matrix, add); + octave_float_complex_matrix, add); INSTALL_BINOP (op_sub, octave_float_complex_matrix, - octave_float_complex_matrix, sub); + octave_float_complex_matrix, sub); INSTALL_BINOP (op_mul, octave_float_complex_matrix, - octave_float_complex_matrix, mul); + octave_float_complex_matrix, mul); INSTALL_BINOP (op_div, octave_float_complex_matrix, - octave_float_complex_matrix, div); + octave_float_complex_matrix, div); INSTALL_BINOP (op_pow, octave_float_complex_matrix, - octave_float_complex_matrix, pow); + octave_float_complex_matrix, pow); INSTALL_BINOP (op_ldiv, octave_float_complex_matrix, - octave_float_complex_matrix, ldiv); + octave_float_complex_matrix, ldiv); INSTALL_BINOP (op_trans_mul, octave_float_complex_matrix, octave_float_complex_matrix, trans_mul); INSTALL_BINOP (op_mul_trans, octave_float_complex_matrix, @@ -275,41 +275,41 @@ octave_float_complex_matrix, herm_ldiv); INSTALL_BINOP (op_lt, octave_float_complex_matrix, - octave_float_complex_matrix, lt); + octave_float_complex_matrix, lt); INSTALL_BINOP (op_le, octave_float_complex_matrix, - octave_float_complex_matrix, le); + octave_float_complex_matrix, le); INSTALL_BINOP (op_eq, octave_float_complex_matrix, - octave_float_complex_matrix, eq); + octave_float_complex_matrix, eq); INSTALL_BINOP (op_ge, octave_float_complex_matrix, - octave_float_complex_matrix, ge); + octave_float_complex_matrix, ge); INSTALL_BINOP (op_gt, octave_float_complex_matrix, - octave_float_complex_matrix, gt); + octave_float_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_float_complex_matrix, - octave_float_complex_matrix, ne); + octave_float_complex_matrix, ne); INSTALL_BINOP (op_el_mul, octave_float_complex_matrix, - octave_float_complex_matrix, el_mul); + octave_float_complex_matrix, el_mul); INSTALL_BINOP (op_el_div, octave_float_complex_matrix, - octave_float_complex_matrix, el_div); + octave_float_complex_matrix, el_div); INSTALL_BINOP (op_el_pow, octave_float_complex_matrix, - octave_float_complex_matrix, el_pow); + octave_float_complex_matrix, el_pow); INSTALL_BINOP (op_el_ldiv, octave_float_complex_matrix, - octave_float_complex_matrix, el_ldiv); + octave_float_complex_matrix, el_ldiv); INSTALL_BINOP (op_el_and, octave_float_complex_matrix, - octave_float_complex_matrix, el_and); + octave_float_complex_matrix, el_and); INSTALL_BINOP (op_el_or, octave_float_complex_matrix, - octave_float_complex_matrix, el_or); + octave_float_complex_matrix, el_or); INSTALL_CATOP (octave_float_complex_matrix, - octave_float_complex_matrix, fcm_fcm); + octave_float_complex_matrix, fcm_fcm); INSTALL_CATOP (octave_complex_matrix, - octave_float_complex_matrix, cm_fcm); + octave_float_complex_matrix, cm_fcm); INSTALL_CATOP (octave_float_complex_matrix, - octave_complex_matrix, fcm_cm); + octave_complex_matrix, fcm_cm); INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, - octave_float_complex_matrix, assign); + octave_float_complex_matrix, assign); INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, - octave_complex_matrix, dbl_assign); + octave_complex_matrix, dbl_assign); INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, octave_null_matrix, null_assign); @@ -328,7 +328,7 @@ octave_float_complex_matrix, assign_el_div); INSTALL_CONVOP (octave_float_complex_matrix, octave_complex_matrix, - float_complex_matrix_to_complex_matrix); + float_complex_matrix_to_complex_matrix); } /*
--- a/src/OPERATORS/op-fcm-fcs.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fcm-fcs.cc Mon Dec 07 14:49:48 2009 -0500 @@ -40,16 +40,16 @@ // complex matrix by complex scalar ops. DEFNDBINOP_OP (add, float_complex_matrix, float_complex, - float_complex_array, float_complex, +) + float_complex_array, float_complex, +) DEFNDBINOP_OP (sub, float_complex_matrix, float_complex, - float_complex_array, float_complex, -) + float_complex_array, float_complex, -) DEFNDBINOP_OP (mul, float_complex_matrix, float_complex, - float_complex_array, float_complex, *) + float_complex_array, float_complex, *) DEFBINOP (div, float_complex_matrix, float_complex) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, - const octave_float_complex&); + const octave_float_complex&); FloatComplex d = v2.float_complex_value (); @@ -64,7 +64,7 @@ DEFBINOP (ldiv, float_complex_matrix, float_complex) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, - const octave_float_complex&); + const octave_float_complex&); FloatComplexMatrix m1 = v1.float_complex_matrix_value (); FloatComplexMatrix m2 = v2.float_complex_matrix_value (); @@ -76,25 +76,25 @@ } DEFNDCMPLXCMPOP_FN (lt, float_complex_matrix, float_complex, - float_complex_array, float_complex, mx_el_lt) + float_complex_array, float_complex, mx_el_lt) DEFNDCMPLXCMPOP_FN (le, float_complex_matrix, float_complex, - float_complex_array, float_complex, mx_el_le) + float_complex_array, float_complex, mx_el_le) DEFNDCMPLXCMPOP_FN (eq, float_complex_matrix, float_complex, - float_complex_array, float_complex, mx_el_eq) + float_complex_array, float_complex, mx_el_eq) DEFNDCMPLXCMPOP_FN (ge, float_complex_matrix, float_complex, - float_complex_array, float_complex, mx_el_ge) + float_complex_array, float_complex, mx_el_ge) DEFNDCMPLXCMPOP_FN (gt, float_complex_matrix, float_complex, - float_complex_array, float_complex, mx_el_gt) + float_complex_array, float_complex, mx_el_gt) DEFNDCMPLXCMPOP_FN (ne, float_complex_matrix, float_complex, - float_complex_array, float_complex, mx_el_ne) + float_complex_array, float_complex, mx_el_ne) DEFNDBINOP_OP (el_mul, float_complex_matrix, float_complex, - float_complex_array, float_complex, *) + float_complex_array, float_complex, *) DEFBINOP (el_div, float_complex_matrix, float_complex) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, - const octave_float_complex&); + const octave_float_complex&); FloatComplex d = v2.float_complex_value (); @@ -105,34 +105,34 @@ } DEFNDBINOP_FN (el_pow, float_complex_matrix, float_complex, - float_complex_array, float_complex, elem_xpow) + float_complex_array, float_complex, elem_xpow) DEFBINOP (el_ldiv, float_complex_matrix, float_complex) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, - const octave_float_complex&); + const octave_float_complex&); return x_el_div (v2.float_complex_value (), v1.float_complex_array_value ()); } DEFNDBINOP_FN (el_and, float_complex_matrix, float_complex, - float_complex_array, float_complex, mx_el_and) + float_complex_array, float_complex, mx_el_and) DEFNDBINOP_FN (el_or, float_complex_matrix, float_complex, - float_complex_array, float_complex, mx_el_or) + float_complex_array, float_complex, mx_el_or) DEFNDCATOP_FN (fcm_fcs, float_complex_matrix, float_complex, - float_complex_array, float_complex_array, concat) + float_complex_array, float_complex_array, concat) DEFNDCATOP_FN (cm_fcs, complex_matrix, float_complex, - float_complex_array, float_complex_array, concat) + float_complex_array, float_complex_array, concat) DEFNDCATOP_FN (fcm_cs, float_complex_matrix, complex, - float_complex_array, float_complex_array, concat) + float_complex_array, float_complex_array, concat) DEFNDASSIGNOP_FN (assign, float_complex_matrix, float_complex, - float_complex, assign) + float_complex, assign) DEFNDASSIGNOP_FN (dbl_assign, complex_matrix, float_complex, - complex, assign) + complex, assign) DEFNDASSIGNOP_OP (assign_add, float_complex_matrix, float_complex_scalar, float_complex, +=) @@ -147,17 +147,17 @@ install_fcm_fcs_ops (void) { INSTALL_BINOP (op_add, octave_float_complex_matrix, - octave_float_complex, add); + octave_float_complex, add); INSTALL_BINOP (op_sub, octave_float_complex_matrix, - octave_float_complex, sub); + octave_float_complex, sub); INSTALL_BINOP (op_mul, octave_float_complex_matrix, - octave_float_complex, mul); + octave_float_complex, mul); INSTALL_BINOP (op_div, octave_float_complex_matrix, - octave_float_complex, div); + octave_float_complex, div); INSTALL_BINOP (op_pow, octave_float_complex_matrix, - octave_float_complex, pow); + octave_float_complex, pow); INSTALL_BINOP (op_ldiv, octave_float_complex_matrix, - octave_float_complex, ldiv); + octave_float_complex, ldiv); INSTALL_BINOP (op_lt, octave_float_complex_matrix, octave_float_complex, lt); INSTALL_BINOP (op_le, octave_float_complex_matrix, octave_float_complex, le); INSTALL_BINOP (op_eq, octave_float_complex_matrix, octave_float_complex, eq); @@ -165,26 +165,26 @@ INSTALL_BINOP (op_gt, octave_float_complex_matrix, octave_float_complex, gt); INSTALL_BINOP (op_ne, octave_float_complex_matrix, octave_float_complex, ne); INSTALL_BINOP (op_el_mul, octave_float_complex_matrix, - octave_float_complex, el_mul); + octave_float_complex, el_mul); INSTALL_BINOP (op_el_div, octave_float_complex_matrix, - octave_float_complex, el_div); + octave_float_complex, el_div); INSTALL_BINOP (op_el_pow, octave_float_complex_matrix, - octave_float_complex, el_pow); + octave_float_complex, el_pow); INSTALL_BINOP (op_el_ldiv, octave_float_complex_matrix, - octave_float_complex, el_ldiv); + octave_float_complex, el_ldiv); INSTALL_BINOP (op_el_and, octave_float_complex_matrix, - octave_float_complex, el_and); + octave_float_complex, el_and); INSTALL_BINOP (op_el_or, octave_float_complex_matrix, - octave_float_complex, el_or); + octave_float_complex, el_or); INSTALL_CATOP (octave_float_complex_matrix, octave_float_complex, fcm_fcs); INSTALL_CATOP (octave_complex_matrix, octave_float_complex, cm_fcs); INSTALL_CATOP (octave_float_complex_matrix, octave_complex, fcm_cs); INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, - octave_float_complex, assign); + octave_float_complex, assign); INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, - octave_float_complex, dbl_assign); + octave_float_complex, dbl_assign); INSTALL_ASSIGNOP (op_add_eq, octave_float_complex_matrix, octave_float_complex_scalar, assign_add);
--- a/src/OPERATORS/op-fcm-fm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fcm-fm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 John W. Eaton + 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -63,11 +63,11 @@ DEFBINOP (div, float_complex_matrix, float_matrix) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, - const octave_float_matrix&); + const octave_float_matrix&); MatrixType typ = v2.matrix_type (); FloatComplexMatrix ret = xdiv (v1.float_complex_matrix_value (), - v2.float_matrix_value (), typ); + v2.float_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -83,62 +83,62 @@ DEFBINOP (ldiv, float_complex_matrix, float_matrix) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, - const octave_float_matrix&); + const octave_float_matrix&); MatrixType typ = v1.matrix_type (); FloatComplexMatrix ret = xleftdiv (v1.float_complex_matrix_value (), - v2.float_matrix_value (), typ); + v2.float_matrix_value (), typ); v1.matrix_type (typ); return ret; } DEFNDCMPLXCMPOP_FN (lt, float_complex_matrix, float_matrix, - float_complex_array, float_array, mx_el_lt) + float_complex_array, float_array, mx_el_lt) DEFNDCMPLXCMPOP_FN (le, float_complex_matrix, float_matrix, - float_complex_array, float_array, mx_el_le) + float_complex_array, float_array, mx_el_le) DEFNDCMPLXCMPOP_FN (eq, float_complex_matrix, float_matrix, - float_complex_array, float_array, mx_el_eq) + float_complex_array, float_array, mx_el_eq) DEFNDCMPLXCMPOP_FN (ge, float_complex_matrix, float_matrix, - float_complex_array, float_array, mx_el_ge) + float_complex_array, float_array, mx_el_ge) DEFNDCMPLXCMPOP_FN (gt, float_complex_matrix, float_matrix, - float_complex_array, float_array, mx_el_gt) + float_complex_array, float_array, mx_el_gt) DEFNDCMPLXCMPOP_FN (ne, float_complex_matrix, float_matrix, - float_complex_array, float_array, mx_el_ne) + float_complex_array, float_array, mx_el_ne) DEFNDBINOP_FN (el_mul, float_complex_matrix, float_matrix, - float_complex_array, float_array, product) + float_complex_array, float_array, product) DEFNDBINOP_FN (el_div, float_complex_matrix, float_matrix, - float_complex_array, float_array, quotient) + float_complex_array, float_array, quotient) DEFNDBINOP_FN (el_pow, float_complex_matrix, float_matrix, - float_complex_array, float_array, elem_xpow) + float_complex_array, float_array, elem_xpow) DEFBINOP (el_ldiv, float_complex_matrix, float_matrix) { CAST_BINOP_ARGS (const octave_float_complex_matrix&, - const octave_float_matrix&); + const octave_float_matrix&); return quotient (v2.float_array_value (), v1.float_complex_array_value ()); } DEFNDBINOP_FN (el_and, float_complex_matrix, float_matrix, - float_complex_array, float_array, mx_el_and) + float_complex_array, float_array, mx_el_and) DEFNDBINOP_FN (el_or, float_complex_matrix, float_matrix, - float_complex_array, float_array, mx_el_or) + float_complex_array, float_array, mx_el_or) DEFNDCATOP_FN (fcm_fm, float_complex_matrix, float_matrix, - float_complex_array, float_array, concat) + float_complex_array, float_array, concat) DEFNDCATOP_FN (cm_fm, complex_matrix, float_matrix, - float_complex_array, float_array, concat) + float_complex_array, float_array, concat) DEFNDCATOP_FN (fcm_m, float_complex_matrix, matrix, - float_complex_array, float_array, concat) + float_complex_array, float_array, concat) DEFNDASSIGNOP_FN (assign, float_complex_matrix, float_matrix, - float_complex_array, assign) + float_complex_array, assign) DEFNDASSIGNOP_FN (dbl_assign, complex_matrix, float_matrix, - complex_array, assign) + complex_array, assign) void install_fcm_fm_ops (void) @@ -149,7 +149,7 @@ INSTALL_BINOP (op_div, octave_float_complex_matrix, octave_float_matrix, div); INSTALL_BINOP (op_pow, octave_float_complex_matrix, octave_float_matrix, pow); INSTALL_BINOP (op_ldiv, octave_float_complex_matrix, - octave_float_matrix, ldiv); + octave_float_matrix, ldiv); INSTALL_BINOP (op_lt, octave_float_complex_matrix, octave_float_matrix, lt); INSTALL_BINOP (op_le, octave_float_complex_matrix, octave_float_matrix, le); INSTALL_BINOP (op_eq, octave_float_complex_matrix, octave_float_matrix, eq); @@ -157,17 +157,17 @@ INSTALL_BINOP (op_gt, octave_float_complex_matrix, octave_float_matrix, gt); INSTALL_BINOP (op_ne, octave_float_complex_matrix, octave_float_matrix, ne); INSTALL_BINOP (op_el_mul, octave_float_complex_matrix, - octave_float_matrix, el_mul); + octave_float_matrix, el_mul); INSTALL_BINOP (op_el_div, octave_float_complex_matrix, - octave_float_matrix, el_div); + octave_float_matrix, el_div); INSTALL_BINOP (op_el_pow, octave_float_complex_matrix, - octave_float_matrix, el_pow); + octave_float_matrix, el_pow); INSTALL_BINOP (op_el_ldiv, octave_float_complex_matrix, - octave_float_matrix, el_ldiv); + octave_float_matrix, el_ldiv); INSTALL_BINOP (op_el_and, octave_float_complex_matrix, - octave_float_matrix, el_and); + octave_float_matrix, el_and); INSTALL_BINOP (op_el_or, octave_float_complex_matrix, - octave_float_matrix, el_or); + octave_float_matrix, el_or); INSTALL_BINOP (op_mul_trans, octave_float_complex_matrix, octave_float_matrix, mul_trans); INSTALL_BINOP (op_mul_herm, octave_float_complex_matrix, @@ -178,9 +178,9 @@ INSTALL_CATOP (octave_float_complex_matrix, octave_matrix, fcm_m); INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, - octave_float_matrix, assign); + octave_float_matrix, assign); INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, - octave_float_matrix, dbl_assign); + octave_float_matrix, dbl_assign); } /*
--- a/src/OPERATORS/op-fcm-fs.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fcm-fs.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 John W. Eaton + 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -76,20 +76,20 @@ } DEFNDCMPLXCMPOP_FN (lt, float_complex_matrix, float_scalar, float_complex_array, - float_scalar, mx_el_lt) + float_scalar, mx_el_lt) DEFNDCMPLXCMPOP_FN (le, float_complex_matrix, float_scalar, float_complex_array, - float_scalar, mx_el_le) + float_scalar, mx_el_le) DEFNDCMPLXCMPOP_FN (eq, float_complex_matrix, float_scalar, float_complex_array, - float_scalar, mx_el_eq) + float_scalar, mx_el_eq) DEFNDCMPLXCMPOP_FN (ge, float_complex_matrix, float_scalar, float_complex_array, - float_scalar, mx_el_ge) + float_scalar, mx_el_ge) DEFNDCMPLXCMPOP_FN (gt, float_complex_matrix, float_scalar, float_complex_array, - float_scalar, mx_el_gt) + float_scalar, mx_el_gt) DEFNDCMPLXCMPOP_FN (ne, float_complex_matrix, float_scalar, float_complex_array, - float_scalar, mx_el_ne) + float_scalar, mx_el_ne) DEFNDBINOP_OP (el_mul, float_complex_matrix, float_scalar, float_complex_array, - float_scalar, *) + float_scalar, *) DEFBINOP (el_div, float_complex_matrix, float) { @@ -104,7 +104,7 @@ } DEFNDBINOP_FN (el_pow, float_complex_matrix, float_scalar, float_complex_array, - float_scalar, elem_xpow) + float_scalar, elem_xpow) DEFBINOP (el_ldiv, float_complex_matrix, float) { @@ -114,18 +114,18 @@ } DEFNDBINOP_FN (el_and, float_complex_matrix, float_scalar, float_complex_array, - float_scalar, mx_el_and) + float_scalar, mx_el_and) DEFNDBINOP_FN (el_or, float_complex_matrix, float_scalar, float_complex_array, - float_scalar, mx_el_or) + float_scalar, mx_el_or) DEFNDCATOP_FN (fcm_fs, float_complex_matrix, float_scalar, float_complex_array, - float_array, concat) + float_array, concat) DEFNDCATOP_FN (cm_fs, complex_matrix, float_scalar, float_complex_array, - float_array, concat) + float_array, concat) DEFNDCATOP_FN (fcm_s, float_complex_matrix, scalar, float_complex_array, - float_array, concat) + float_array, concat) DEFNDASSIGNOP_FN (assign, float_complex_matrix, float_scalar, float_complex_array, assign) DEFNDASSIGNOP_FN (dbl_assign, complex_matrix, float_scalar, complex_array, assign) @@ -162,9 +162,9 @@ INSTALL_CATOP (octave_float_complex_matrix, octave_scalar, fcm_s); INSTALL_ASSIGNOP (op_asn_eq, octave_float_complex_matrix, - octave_float_scalar, assign); + octave_float_scalar, assign); INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, - octave_float_scalar, dbl_assign); + octave_float_scalar, dbl_assign); INSTALL_ASSIGNOP (op_mul_eq, octave_float_complex_matrix, octave_float_scalar, assign_mul);
--- a/src/OPERATORS/op-fcs-fcm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fcs-fcm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 John W. Eaton + 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -72,24 +72,24 @@ } DEFNDCMPLXCMPOP_FN (lt, float_complex, float_complex_matrix, float_complex, - float_complex_array, mx_el_lt) + float_complex_array, mx_el_lt) DEFNDCMPLXCMPOP_FN (le, float_complex, float_complex_matrix, float_complex, - float_complex_array, mx_el_le) + float_complex_array, mx_el_le) DEFNDCMPLXCMPOP_FN (eq, float_complex, float_complex_matrix, float_complex, - float_complex_array, mx_el_eq) + float_complex_array, mx_el_eq) DEFNDCMPLXCMPOP_FN (ge, float_complex, float_complex_matrix, float_complex, - float_complex_array, mx_el_ge) + float_complex_array, mx_el_ge) DEFNDCMPLXCMPOP_FN (gt, float_complex, float_complex_matrix, float_complex, - float_complex_array, mx_el_gt) + float_complex_array, mx_el_gt) DEFNDCMPLXCMPOP_FN (ne, float_complex, float_complex_matrix, float_complex, - float_complex_array, mx_el_ne) + float_complex_array, mx_el_ne) DEFNDBINOP_OP (el_mul, float_complex, float_complex_matrix, float_complex, - float_complex_array, *) + float_complex_array, *) DEFNDBINOP_FN (el_div, float_complex, float_complex_matrix, float_complex, - float_complex_array, x_el_div) + float_complex_array, x_el_div) DEFNDBINOP_FN (el_pow, float_complex, float_complex_matrix, float_complex, - float_complex_array, elem_xpow) + float_complex_array, elem_xpow) DEFBINOP (el_ldiv, float_complex, float_complex_matrix) {
--- a/src/OPERATORS/op-fcs-fcs.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fcs-fcs.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* -Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2007, 2008 - John W. Eaton +Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2007, + 2008, 2009 John W. Eaton This file is part of Octave. @@ -134,7 +134,7 @@ CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_complex&); return (v1.float_complex_value () != static_cast<float>(0.0) && - v2.float_complex_value () != static_cast<float>(0.0)); + v2.float_complex_value () != static_cast<float>(0.0)); } DEFBINOP (el_or, float_complex, float_complex) @@ -142,17 +142,17 @@ CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_complex&); return (v1.float_complex_value () != static_cast<float>(0.0) || - v2.float_complex_value () != static_cast<float>(0.0)); + v2.float_complex_value () != static_cast<float>(0.0)); } DEFNDCATOP_FN (fcs_fcs, float_complex, float_complex, float_complex_array, - float_complex_array, concat) + float_complex_array, concat) DEFNDCATOP_FN (cs_fcs, complex, float_complex, float_complex_array, - float_complex_array, concat) + float_complex_array, concat) DEFNDCATOP_FN (fcs_cs, float_complex, complex, float_complex_array, - float_complex_array, concat) + float_complex_array, concat) CONVDECL (float_complex_to_complex) { @@ -205,7 +205,7 @@ INSTALL_ASSIGNCONV (octave_float_complex, octave_null_sq_str, octave_float_complex_matrix); INSTALL_CONVOP (octave_float_complex, octave_complex_matrix, - float_complex_to_complex); + float_complex_to_complex); } /*
--- a/src/OPERATORS/op-fcs-fm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fcs-fm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 John W. Eaton + 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -79,24 +79,24 @@ } DEFNDCMPLXCMPOP_FN (lt, float_complex, float_matrix, float_complex, - float_array, mx_el_lt) + float_array, mx_el_lt) DEFNDCMPLXCMPOP_FN (le, float_complex, float_matrix, float_complex, - float_array, mx_el_le) + float_array, mx_el_le) DEFNDCMPLXCMPOP_FN (eq, float_complex, float_matrix, float_complex, - float_array, mx_el_eq) + float_array, mx_el_eq) DEFNDCMPLXCMPOP_FN (ge, float_complex, float_matrix, float_complex, - float_array, mx_el_ge) + float_array, mx_el_ge) DEFNDCMPLXCMPOP_FN (gt, float_complex, float_matrix, float_complex, - float_array, mx_el_gt) + float_array, mx_el_gt) DEFNDCMPLXCMPOP_FN (ne, float_complex, float_matrix, float_complex, - float_array, mx_el_ne) + float_array, mx_el_ne) DEFNDBINOP_OP (el_mul, float_complex, float_matrix, float_complex, - float_array, *) + float_array, *) DEFNDBINOP_FN (el_div, float_complex, float_matrix, float_complex, - float_array, x_el_div) + float_array, x_el_div) DEFNDBINOP_FN (el_pow, float_complex, float_matrix, float_complex, - float_array, elem_xpow) + float_array, elem_xpow) DEFBINOP (el_ldiv, float_complex, float_matrix) { @@ -111,18 +111,18 @@ } DEFNDBINOP_FN (el_and, float_complex, float_matrix, float_complex, - float_array, mx_el_and) + float_array, mx_el_and) DEFNDBINOP_FN (el_or, float_complex, float_matrix, float_complex, - float_array, mx_el_or) + float_array, mx_el_or) DEFNDCATOP_FN (fcs_fm, float_complex, float_matrix, float_complex_array, - float_array, concat) + float_array, concat) DEFNDCATOP_FN (cs_fm, complex, float_matrix, float_complex_array, - float_array, concat) + float_array, concat) DEFNDCATOP_FN (fcs_m, float_complex, matrix, float_complex_array, - float_array, concat) + float_array, concat) void install_fcs_fm_ops (void) @@ -151,9 +151,9 @@ INSTALL_CATOP (octave_float_complex, octave_matrix, fcs_m); INSTALL_ASSIGNCONV (octave_float_complex, octave_float_matrix, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV (octave_complex, octave_float_matrix, - octave_complex_matrix); + octave_complex_matrix); } /*
--- a/src/OPERATORS/op-fcs-fs.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fcs-fs.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996, 1997, 2000, 2002, 2003, 2004, 2005, 2007, 2008 +Copyright (C) 1996, 1997, 2000, 2002, 2003, 2004, 2005, 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -111,7 +111,7 @@ CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); return (v1.float_complex_value () != static_cast<float>(0.0) && - v2.float_value ()); + v2.float_value ()); } DEFBINOP (el_or, float_complex, float) @@ -119,17 +119,17 @@ CAST_BINOP_ARGS (const octave_float_complex&, const octave_float_scalar&); return (v1.float_complex_value () != static_cast<float>(0.0) || - v2.float_value ()); + v2.float_value ()); } DEFNDCATOP_FN (fcs_fs, float_complex, float_scalar, float_complex_array, - float_array, concat) + float_array, concat) DEFNDCATOP_FN (cs_fs, complex, float_scalar, float_complex_array, - float_array, concat) + float_array, concat) DEFNDCATOP_FN (fcs_s, float_complex, scalar, float_complex_array, - float_array, concat) + float_array, concat) void install_fcs_fs_ops (void) @@ -158,9 +158,9 @@ INSTALL_CATOP (octave_float_complex, octave_scalar, fcs_s); INSTALL_ASSIGNCONV (octave_float_complex, octave_float_scalar, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV (octave_complex, octave_float_scalar, - octave_complex_matrix); + octave_complex_matrix); } /*
--- a/src/OPERATORS/op-fm-fcm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fm-fcm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 John W. Eaton + 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -45,9 +45,9 @@ // matrix by complex matrix ops. DEFNDBINOP_OP (add, float_matrix, float_complex_matrix, float_array, - float_complex_array, +) + float_complex_array, +) DEFNDBINOP_OP (sub, float_matrix, float_complex_matrix, float_array, - float_complex_array, -) + float_complex_array, -) DEFBINOP_OP (mul, float_matrix, float_complex_matrix, *) @@ -65,11 +65,11 @@ DEFBINOP (div, float_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_matrix&, - const octave_float_complex_matrix&); + const octave_float_complex_matrix&); MatrixType typ = v2.matrix_type (); FloatComplexMatrix ret = xdiv (v1.float_matrix_value (), - v2.float_complex_matrix_value (), typ); + v2.float_complex_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -84,11 +84,11 @@ DEFBINOP (ldiv, float_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_matrix&, - const octave_float_complex_matrix&); + const octave_float_complex_matrix&); MatrixType typ = v1.matrix_type (); FloatComplexMatrix ret = xleftdiv (v1.float_matrix_value (), - v2.float_complex_matrix_value (), typ); + v2.float_complex_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -108,46 +108,46 @@ } DEFNDCMPLXCMPOP_FN (lt, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_lt) + float_complex_array, mx_el_lt) DEFNDCMPLXCMPOP_FN (le, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_le) + float_complex_array, mx_el_le) DEFNDCMPLXCMPOP_FN (eq, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_eq) + float_complex_array, mx_el_eq) DEFNDCMPLXCMPOP_FN (ge, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_ge) + float_complex_array, mx_el_ge) DEFNDCMPLXCMPOP_FN (gt, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_gt) + float_complex_array, mx_el_gt) DEFNDCMPLXCMPOP_FN (ne, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_ne) + float_complex_array, mx_el_ne) DEFNDBINOP_FN (el_mul, float_matrix, float_complex_matrix, float_array, - float_complex_array, product) + float_complex_array, product) DEFNDBINOP_FN (el_div, float_matrix, float_complex_matrix, float_array, - float_complex_array, quotient) + float_complex_array, quotient) DEFNDBINOP_FN (el_pow, float_matrix, float_complex_matrix, float_array, - float_complex_array, elem_xpow) + float_complex_array, elem_xpow) DEFBINOP (el_ldiv, float_matrix, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_matrix&, - const octave_float_complex_matrix&); + const octave_float_complex_matrix&); return quotient (v2.float_complex_array_value (), v1.float_array_value ()); } DEFNDBINOP_FN (el_and, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_and) + float_complex_array, mx_el_and) DEFNDBINOP_FN (el_or, float_matrix, float_complex_matrix, float_array, - float_complex_array, mx_el_or) + float_complex_array, mx_el_or) DEFNDCATOP_FN (fm_fcm, float_matrix, float_complex_matrix, float_array, - float_complex_array, concat) + float_complex_array, concat) DEFNDCATOP_FN (m_fcm, matrix, float_complex_matrix, float_array, - float_complex_array, concat) + float_complex_array, concat) DEFNDCATOP_FN (fm_cm, float_matrix, complex_matrix, float_array, - float_complex_array, concat) + float_complex_array, concat) DEFCONV (float_complex_matrix_conv, float_matrix, float_complex_matrix) { @@ -165,7 +165,7 @@ INSTALL_BINOP (op_div, octave_float_matrix, octave_float_complex_matrix, div); INSTALL_BINOP (op_pow, octave_float_matrix, octave_float_complex_matrix, pow); INSTALL_BINOP (op_ldiv, octave_float_matrix, - octave_float_complex_matrix, ldiv); + octave_float_complex_matrix, ldiv); INSTALL_BINOP (op_lt, octave_float_matrix, octave_float_complex_matrix, lt); INSTALL_BINOP (op_le, octave_float_matrix, octave_float_complex_matrix, le); INSTALL_BINOP (op_eq, octave_float_matrix, octave_float_complex_matrix, eq); @@ -173,17 +173,17 @@ INSTALL_BINOP (op_gt, octave_float_matrix, octave_float_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_float_matrix, octave_float_complex_matrix, ne); INSTALL_BINOP (op_el_mul, octave_float_matrix, - octave_float_complex_matrix, el_mul); + octave_float_complex_matrix, el_mul); INSTALL_BINOP (op_el_div, octave_float_matrix, - octave_float_complex_matrix, el_div); + octave_float_complex_matrix, el_div); INSTALL_BINOP (op_el_pow, octave_float_matrix, - octave_float_complex_matrix, el_pow); + octave_float_complex_matrix, el_pow); INSTALL_BINOP (op_el_ldiv, octave_float_matrix, - octave_float_complex_matrix, el_ldiv); + octave_float_complex_matrix, el_ldiv); INSTALL_BINOP (op_el_and, octave_float_matrix, - octave_float_complex_matrix, el_and); + octave_float_complex_matrix, el_and); INSTALL_BINOP (op_el_or, octave_float_matrix, - octave_float_complex_matrix, el_or); + octave_float_complex_matrix, el_or); INSTALL_BINOP (op_trans_mul, octave_float_matrix, octave_float_complex_matrix, trans_mul); INSTALL_BINOP (op_herm_mul, octave_float_matrix, @@ -198,12 +198,12 @@ INSTALL_CATOP (octave_float_matrix, octave_complex_matrix, fm_cm); INSTALL_ASSIGNCONV (octave_float_matrix, octave_float_complex_matrix, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV (octave_matrix, octave_float_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP (octave_float_matrix, octave_float_complex_matrix, - float_complex_matrix_conv); + float_complex_matrix_conv); } /*
--- a/src/OPERATORS/op-fm-fcs.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fm-fcs.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 John W. Eaton + 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -79,20 +79,20 @@ } DEFNDCMPLXCMPOP_FN (lt, float_matrix, float_complex, float_array, - float_complex, mx_el_lt) + float_complex, mx_el_lt) DEFNDCMPLXCMPOP_FN (le, float_matrix, float_complex, float_array, - float_complex, mx_el_le) + float_complex, mx_el_le) DEFNDCMPLXCMPOP_FN (eq, float_matrix, float_complex, float_array, - float_complex, mx_el_eq) + float_complex, mx_el_eq) DEFNDCMPLXCMPOP_FN (ge, float_matrix, float_complex, float_array, - float_complex, mx_el_ge) + float_complex, mx_el_ge) DEFNDCMPLXCMPOP_FN (gt, float_matrix, float_complex, float_array, - float_complex, mx_el_gt) + float_complex, mx_el_gt) DEFNDCMPLXCMPOP_FN (ne, float_matrix, float_complex, float_array, - float_complex, mx_el_ne) + float_complex, mx_el_ne) DEFNDBINOP_OP (el_mul, float_matrix, float_complex, float_array, - float_complex, *) + float_complex, *) DEFBINOP (el_div, float_matrix, float_complex) { @@ -107,7 +107,7 @@ } DEFNDBINOP_FN (el_pow, float_matrix, float_complex, float_array, - float_complex, elem_xpow) + float_complex, elem_xpow) DEFBINOP (el_ldiv, float_matrix, flaot_complex) { @@ -117,18 +117,18 @@ } DEFNDBINOP_FN (el_and, float_matrix, float_complex, float_array, - float_complex, mx_el_and) + float_complex, mx_el_and) DEFNDBINOP_FN (el_or, float_matrix, float_complex, float_array, - float_complex, mx_el_or) + float_complex, mx_el_or) DEFNDCATOP_FN (fm_fcs, float_matrix, float_complex, float_array, - float_complex_array, concat) + float_complex_array, concat) DEFNDCATOP_FN (m_fcs, matrix, float_complex, float_array, - float_complex_array, concat) + float_complex_array, concat) DEFNDCATOP_FN (fm_cs, float_matrix, complex, float_array, - float_complex_array, concat) + float_complex_array, concat) void install_fm_fcs_ops (void) @@ -157,9 +157,9 @@ INSTALL_CATOP (octave_float_matrix, octave_complex, fm_cs); INSTALL_ASSIGNCONV (octave_float_matrix, octave_float_complex, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV (octave_matrix, octave_float_complex, - octave_complex_matrix); + octave_complex_matrix); } /*
--- a/src/OPERATORS/op-fm-fm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fm-fm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008 John W. Eaton + 2006, 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -72,7 +72,7 @@ MatrixType typ = v2.matrix_type (); FloatMatrix ret = xdiv (v1.float_matrix_value (), - v2.float_matrix_value (), typ); + v2.float_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -90,7 +90,7 @@ MatrixType typ = v1.matrix_type (); FloatMatrix ret = xleftdiv (v1.float_matrix_value (), - v2.float_matrix_value (), typ); + v2.float_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -118,57 +118,57 @@ MatrixType typ = v1.matrix_type (); FloatMatrix ret = xleftdiv (v1.float_matrix_value (), - v2.float_matrix_value (), typ, blas_trans); + v2.float_matrix_value (), typ, blas_trans); v1.matrix_type (typ); return ret; } DEFNDBINOP_FN (lt, float_matrix, float_matrix, float_array, - float_array, mx_el_lt) + float_array, mx_el_lt) DEFNDBINOP_FN (le, float_matrix, float_matrix, float_array, - float_array, mx_el_le) + float_array, mx_el_le) DEFNDBINOP_FN (eq, float_matrix, float_matrix, float_array, - float_array, mx_el_eq) + float_array, mx_el_eq) DEFNDBINOP_FN (ge, float_matrix, float_matrix, float_array, - float_array, mx_el_ge) + float_array, mx_el_ge) DEFNDBINOP_FN (gt, float_matrix, float_matrix, float_array, - float_array, mx_el_gt) + float_array, mx_el_gt) DEFNDBINOP_FN (ne, float_matrix, float_matrix, float_array, - float_array, mx_el_ne) + float_array, mx_el_ne) DEFNDBINOP_FN (el_mul, float_matrix, float_matrix, float_array, - float_array, product) + float_array, product) DEFNDBINOP_FN (el_div, float_matrix, float_matrix, float_array, - float_array, quotient) + float_array, quotient) DEFNDBINOP_FN (el_pow, float_matrix, float_matrix, float_array, - float_array, elem_xpow) + float_array, elem_xpow) DEFBINOP (el_ldiv, float_matrix, float_matrix) { CAST_BINOP_ARGS (const octave_float_matrix&, const octave_float_matrix&); return octave_value (quotient (v2.float_array_value (), - v1.float_array_value ())); + v1.float_array_value ())); } DEFNDBINOP_FN (el_and, float_matrix, float_matrix, float_array, - float_array, mx_el_and) + float_array, mx_el_and) DEFNDBINOP_FN (el_or, float_matrix, float_matrix, float_array, - float_array, mx_el_or) + float_array, mx_el_or) DEFNDBINOP_FN (el_not_and, float_matrix, float_matrix, float_array, - float_array, mx_el_not_and) + float_array, mx_el_not_and) DEFNDBINOP_FN (el_not_or, float_matrix, float_matrix, float_array, - float_array, mx_el_not_or) + float_array, mx_el_not_or) DEFNDBINOP_FN (el_and_not, float_matrix, float_matrix, float_array, - float_array, mx_el_and_not) + float_array, mx_el_and_not) DEFNDBINOP_FN (el_or_not, float_matrix, float_matrix, float_array, - float_array, mx_el_or_not) + float_array, mx_el_or_not) DEFNDCATOP_FN (fm_fm, float_matrix, float_matrix, float_array, - float_array, concat) + float_array, concat) DEFNDCATOP_FN (m_fm, matrix, float_matrix, float_array, float_array, concat) @@ -239,9 +239,9 @@ INSTALL_CATOP (octave_float_matrix, octave_matrix, fm_m); INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, - octave_float_matrix, assign); + octave_float_matrix, assign); INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, - octave_float_matrix, dbl_assign); + octave_float_matrix, dbl_assign); INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_null_matrix, null_assign); INSTALL_ASSIGNOP (op_asn_eq, octave_float_matrix, octave_null_str, null_assign);
--- a/src/OPERATORS/op-fm-fs.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fm-fs.cc Mon Dec 07 14:49:48 2009 -0500 @@ -71,17 +71,17 @@ } DEFNDBINOP_FN (lt, float_matrix, float_scalar, float_array, - float_scalar, mx_el_lt) + float_scalar, mx_el_lt) DEFNDBINOP_FN (le, float_matrix, float_scalar, float_array, - float_scalar, mx_el_le) + float_scalar, mx_el_le) DEFNDBINOP_FN (eq, float_matrix, float_scalar, float_array, - float_scalar, mx_el_eq) + float_scalar, mx_el_eq) DEFNDBINOP_FN (ge, float_matrix, float_scalar, float_array, - float_scalar, mx_el_ge) + float_scalar, mx_el_ge) DEFNDBINOP_FN (gt, float_matrix, float_scalar, float_array, - float_scalar, mx_el_gt) + float_scalar, mx_el_gt) DEFNDBINOP_FN (ne, float_matrix, float_scalar, float_array, - float_scalar, mx_el_ne) + float_scalar, mx_el_ne) DEFNDBINOP_OP (el_mul, float_matrix, float_scalar, float_array, float_scalar, *) @@ -98,7 +98,7 @@ } DEFNDBINOP_FN (el_pow, float_matrix, float_scalar, float_array, - float_scalar, elem_xpow) + float_scalar, elem_xpow) DEFBINOP (el_ldiv, float_matrix, float) { @@ -108,12 +108,12 @@ } DEFNDBINOP_FN (el_and, float_matrix, float_scalar, float_array, - float_scalar, mx_el_and) + float_scalar, mx_el_and) DEFNDBINOP_FN (el_or, float_matrix, float_scalar, float_array, - float_scalar, mx_el_or) + float_scalar, mx_el_or) DEFNDCATOP_FN (fm_fs, float_matrix, float_scalar, float_array, - float_array, concat) + float_array, concat) DEFNDCATOP_FN (m_fs, matrix, float_scalar, float_array, float_array, concat)
--- a/src/OPERATORS/op-fs-fcm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fs-fcm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008 John W. Eaton + 2006, 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -46,16 +46,16 @@ // scalar by complex matrix ops. DEFNDBINOP_OP (add, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, +) + float_complex_array, +) DEFNDBINOP_OP (sub, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, -) + float_complex_array, -) DEFNDBINOP_OP (mul, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, *) + float_complex_array, *) DEFBINOP (div, float_scalar, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_scalar&, - const octave_float_complex_matrix&); + const octave_float_complex_matrix&); FloatMatrix m1 = v1.float_matrix_value (); FloatComplexMatrix m2 = v2.float_complex_matrix_value (); @@ -72,7 +72,7 @@ DEFBINOP (ldiv, float_scalar, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_scalar&, - const octave_float_complex_matrix&); + const octave_float_complex_matrix&); float d = v1.float_value (); @@ -83,29 +83,29 @@ } DEFNDCMPLXCMPOP_FN (lt, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, mx_el_lt) + float_complex_array, mx_el_lt) DEFNDCMPLXCMPOP_FN (le, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, mx_el_le) + float_complex_array, mx_el_le) DEFNDCMPLXCMPOP_FN (eq, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, mx_el_eq) + float_complex_array, mx_el_eq) DEFNDCMPLXCMPOP_FN (ge, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, mx_el_ge) + float_complex_array, mx_el_ge) DEFNDCMPLXCMPOP_FN (gt, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, mx_el_gt) + float_complex_array, mx_el_gt) DEFNDCMPLXCMPOP_FN (ne, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, mx_el_ne) + float_complex_array, mx_el_ne) DEFNDBINOP_OP (el_mul, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, *) + float_complex_array, *) DEFNDBINOP_FN (el_div, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, x_el_div) + float_complex_array, x_el_div) DEFNDBINOP_FN (el_pow, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, elem_xpow) + float_complex_array, elem_xpow) DEFBINOP (el_ldiv, float_scalar, float_complex_matrix) { CAST_BINOP_ARGS (const octave_float_scalar&, - const octave_float_complex_matrix&); + const octave_float_complex_matrix&); float d = v1.float_value (); @@ -116,18 +116,18 @@ } DEFNDBINOP_FN (el_and, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, mx_el_and) + float_complex_array, mx_el_and) DEFNDBINOP_FN (el_or, float_scalar, float_complex_matrix, float_scalar, - float_complex_array, mx_el_or) + float_complex_array, mx_el_or) DEFNDCATOP_FN (fs_fcm, float_scalar, float_complex_matrix, float_array, - float_complex_array, concat) + float_complex_array, concat) DEFNDCATOP_FN (s_fcm, scalar, float_complex_matrix, float_array, - float_complex_array, concat) + float_complex_array, concat) DEFNDCATOP_FN (fs_cm, float_scalar, complex_matrix, float_array, - float_complex_array, concat) + float_complex_array, concat) DEFCONV (float_complex_matrix_conv, float_scalar, float_complex_matrix) { @@ -145,7 +145,7 @@ INSTALL_BINOP (op_div, octave_float_scalar, octave_float_complex_matrix, div); INSTALL_BINOP (op_pow, octave_float_scalar, octave_float_complex_matrix, pow); INSTALL_BINOP (op_ldiv, octave_float_scalar, - octave_float_complex_matrix, ldiv); + octave_float_complex_matrix, ldiv); INSTALL_BINOP (op_lt, octave_float_scalar, octave_float_complex_matrix, lt); INSTALL_BINOP (op_le, octave_float_scalar, octave_float_complex_matrix, le); INSTALL_BINOP (op_eq, octave_float_scalar, octave_float_complex_matrix, eq); @@ -153,29 +153,29 @@ INSTALL_BINOP (op_gt, octave_float_scalar, octave_float_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_float_scalar, octave_float_complex_matrix, ne); INSTALL_BINOP (op_el_mul, octave_float_scalar, - octave_float_complex_matrix, el_mul); + octave_float_complex_matrix, el_mul); INSTALL_BINOP (op_el_div, octave_float_scalar, - octave_float_complex_matrix, el_div); + octave_float_complex_matrix, el_div); INSTALL_BINOP (op_el_pow, octave_float_scalar, - octave_float_complex_matrix, el_pow); + octave_float_complex_matrix, el_pow); INSTALL_BINOP (op_el_ldiv, octave_float_scalar, - octave_float_complex_matrix, el_ldiv); + octave_float_complex_matrix, el_ldiv); INSTALL_BINOP (op_el_and, octave_float_scalar, - octave_float_complex_matrix, el_and); + octave_float_complex_matrix, el_and); INSTALL_BINOP (op_el_or, octave_float_scalar, - octave_float_complex_matrix, el_or); + octave_float_complex_matrix, el_or); INSTALL_CATOP (octave_float_scalar, octave_float_complex_matrix, fs_fcm); INSTALL_CATOP (octave_scalar, octave_float_complex_matrix, s_fcm); INSTALL_CATOP (octave_float_scalar, octave_complex_matrix, fs_cm); INSTALL_ASSIGNCONV (octave_float_scalar, octave_float_complex_matrix, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV (octave_scalar, octave_float_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP (octave_float_scalar, octave_float_complex_matrix, - float_complex_matrix_conv); + float_complex_matrix_conv); } /*
--- a/src/OPERATORS/op-fs-fcs.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fs-fcs.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996, 1997, 2000, 2002, 2003, 2004, 2005, 2007, 2008 +Copyright (C) 1996, 1997, 2000, 2002, 2003, 2004, 2005, 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -121,13 +121,13 @@ } DEFNDCATOP_FN (fs_fcs, float_scalar, float_complex, float_array, - float_complex_array, concat) + float_complex_array, concat) DEFNDCATOP_FN (s_fcs, scalar, float_complex, float_array, - float_complex_array, concat) + float_complex_array, concat) DEFNDCATOP_FN (fs_cs, float_scalar, complex, float_array, - float_complex_array, concat) + float_complex_array, concat) void install_fs_fcs_ops (void) @@ -156,9 +156,9 @@ INSTALL_CATOP (octave_float_scalar, octave_complex, fs_cs); INSTALL_ASSIGNCONV (octave_float_scalar, octave_float_complex, - octave_float_complex_matrix); + octave_float_complex_matrix); INSTALL_ASSIGNCONV (octave_scalar, octave_float_complex, - octave_complex_matrix); + octave_complex_matrix); } /*
--- a/src/OPERATORS/op-fs-fm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-fs-fm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 John W. Eaton + 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -72,24 +72,24 @@ } DEFNDBINOP_FN (lt, float_scalar, float_matrix, float_scalar, - float_array, mx_el_lt) + float_array, mx_el_lt) DEFNDBINOP_FN (le, float_scalar, float_matrix, float_scalar, - float_array, mx_el_le) + float_array, mx_el_le) DEFNDBINOP_FN (eq, float_scalar, float_matrix, float_scalar, - float_array, mx_el_eq) + float_array, mx_el_eq) DEFNDBINOP_FN (ge, float_scalar, float_matrix, float_scalar, - float_array, mx_el_ge) + float_array, mx_el_ge) DEFNDBINOP_FN (gt, float_scalar, float_matrix, float_scalar, float_array, mx_el_gt) DEFNDBINOP_FN (ne, float_scalar, float_matrix, float_scalar, - float_array, mx_el_ne) + float_array, mx_el_ne) DEFNDBINOP_OP (el_mul, float_scalar, float_matrix, float_scalar, - float_array, *) + float_array, *) DEFNDBINOP_FN (el_div, float_scalar, float_matrix, float_scalar, - float_array, x_el_div) + float_array, x_el_div) DEFNDBINOP_FN (el_pow, float_scalar, float_matrix, float_scalar, - float_array, elem_xpow) + float_array, elem_xpow) DEFBINOP (el_ldiv, float_scalar, float_matrix) { @@ -104,12 +104,12 @@ } DEFNDBINOP_FN (el_and, float_scalar, float_matrix, float_scalar, - float_array, mx_el_and) + float_array, mx_el_and) DEFNDBINOP_FN (el_or, float_scalar, float_matrix, float_scalar, - float_array, mx_el_or) + float_array, mx_el_or) DEFNDCATOP_FN (fs_fm, float_scalar, float_matrix, float_array, - float_array, concat) + float_array, concat) DEFNDCATOP_FN (s_fm, scalar, float_matrix, float_array, float_array, concat)
--- a/src/OPERATORS/op-int-concat.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-int-concat.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2007, 2008 John W. Eaton +Copyright (C) 2004, 2005, 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -135,7 +135,7 @@ OCTAVE_DOUBLE_INT_CONCAT_FN (int16) OCTAVE_DOUBLE_INT_CONCAT_FN (int32) OCTAVE_DOUBLE_INT_CONCAT_FN (int64) - + OCTAVE_DOUBLE_INT_CONCAT_FN (uint8) OCTAVE_DOUBLE_INT_CONCAT_FN (uint16) OCTAVE_DOUBLE_INT_CONCAT_FN (uint32) @@ -155,7 +155,7 @@ OCTAVE_FLOAT_INT_CONCAT_FN (int16) OCTAVE_FLOAT_INT_CONCAT_FN (int32) OCTAVE_FLOAT_INT_CONCAT_FN (int64) - + OCTAVE_FLOAT_INT_CONCAT_FN (uint8) OCTAVE_FLOAT_INT_CONCAT_FN (uint16) OCTAVE_FLOAT_INT_CONCAT_FN (uint32) @@ -175,7 +175,7 @@ OCTAVE_CHAR_INT_CONCAT_FN (int16) OCTAVE_CHAR_INT_CONCAT_FN (int32) OCTAVE_CHAR_INT_CONCAT_FN (int64) - + OCTAVE_CHAR_INT_CONCAT_FN (uint8) OCTAVE_CHAR_INT_CONCAT_FN (uint16) OCTAVE_CHAR_INT_CONCAT_FN (uint32)
--- a/src/OPERATORS/op-int-conv.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-int-conv.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2007, 2008 John W. Eaton +Copyright (C) 2004, 2005, 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -55,13 +55,13 @@ octave_ ## tto ## _matrix v2 = v.tto ## _array_value (); \ if (octave_ ## tto ::get_trunc_flag ()) \ gripe_truncated_conversion (v.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ if (octave_ ## tto ::get_nan_flag ()) \ gripe_nan_conversion (v.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ if (octave_ ## tto ::get_non_int_flag ()) \ gripe_non_integer_conversion (v.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## tto ::clear_conv_flag (); \ return new octave_ ## tto ## _matrix (v2); \ }
--- a/src/OPERATORS/op-int.h Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-int.h Mon Dec 07 14:49:48 2009 -0500 @@ -30,7 +30,7 @@ (v1.t1 ## _value () op v2.t2 ## _value ()); \ if (octave_ ## t3 ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated (#op, v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## t3 ::clear_conv_flag (); \ return retval; \ } @@ -43,31 +43,31 @@ (v1.e1 ## _value () op v2.e2 ## _value ()); \ if (octave_ ## t3 ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated (#op, v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## t3 ::clear_conv_flag (); \ return retval; \ } -#define DEFINTBINOP_FN(name, t1, t2, f, t3, op) \ +#define DEFINTBINOP_FN(name, t1, t2, f, t3, op) \ BINOPDECL (name, a1, a2) \ { \ CAST_BINOP_ARGS (const octave_ ## t1&, const octave_ ## t2&); \ octave_value retval = octave_value (f (v1.t1 ## _value (), v2.t2 ## _value ())); \ if (octave_ ## t3 ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated (#op, v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## t3 ::clear_conv_flag (); \ return retval; \ } -#define DEFINTNDBINOP_FN(name, t1, t2, e1, e2, f, t3, op) \ +#define DEFINTNDBINOP_FN(name, t1, t2, e1, e2, f, t3, op) \ BINOPDECL (name, a1, a2) \ { \ CAST_BINOP_ARGS (const octave_ ## t1&, const octave_ ## t2&); \ octave_value retval = octave_value (f (v1.e1 ## _value (), v2.e2 ## _value ())); \ if (octave_ ## t3 ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated (#op, v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## t3 ::clear_conv_flag (); \ return retval; \ } @@ -187,7 +187,7 @@ DEFNCUNOP_METHOD (s_incr, TYPE ## _scalar, increment) \ DEFNCUNOP_METHOD (s_decr, TYPE ## _scalar, decrement) -#define OCTAVE_SS_INT_ARITH_OPS(PFX, T1, T2, T3) \ +#define OCTAVE_SS_INT_ARITH_OPS(PFX, T1, T2, T3) \ /* scalar by scalar ops. */ \ \ DEFINTBINOP_OP (PFX ## _add, T1 ## scalar, T2 ## scalar, +, T3) \ @@ -204,12 +204,12 @@ octave_value retval = octave_value (v1.T1 ## scalar_value () / v2.T2 ## scalar_value ()); \ if (octave_ ## T3 ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated ("/", v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## T3 ::clear_conv_flag (); \ return retval; \ } \ \ - DEFINTBINOP_FN (PFX ## _pow, T1 ## scalar, T2 ## scalar, xpow, T3, ^) \ + DEFINTBINOP_FN (PFX ## _pow, T1 ## scalar, T2 ## scalar, xpow, T3, ^) \ \ DEFBINOP (PFX ## _ldiv, T1 ## scalar, T2 ## scalar) \ { \ @@ -221,12 +221,12 @@ octave_value retval = octave_value (v2.T2 ## scalar_value () / v1.T1 ## scalar_value ()); \ if (octave_ ## T3 ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated ("\\", v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## T3 ::clear_conv_flag (); \ return retval; \ } \ \ - DEFINTBINOP_OP (PFX ## _el_mul, T1 ## scalar, T2 ## scalar, *, T3) \ + DEFINTBINOP_OP (PFX ## _el_mul, T1 ## scalar, T2 ## scalar, *, T3) \ \ DEFBINOP (PFX ## _el_div, T1 ## scalar, T2 ## scalar) \ { \ @@ -238,7 +238,7 @@ octave_value retval = octave_value (v1.T1 ## scalar_value () / v2.T2 ## scalar_value ()); \ if (octave_ ## T3 ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated (".\\", v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## T3 ::clear_conv_flag (); \ return retval; \ } \ @@ -255,7 +255,7 @@ octave_value retval = octave_value (v2.T2 ## scalar_value () / v1.T1 ## scalar_value ()); \ if (octave_ ## T3 ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated (".\\", v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## T3 ::clear_conv_flag (); \ return retval; \ } \ @@ -362,7 +362,7 @@ octave_value retval = octave_value (v2.TS ## scalar_value () / v1.TS ## scalar_value ()); \ if (octave_ ## TI ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated ("\\", v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## TI ::clear_conv_flag (); \ return retval; \ } \ @@ -375,7 +375,7 @@ octave_value retval = octave_value (v1.TS ## scalar_value () / v2.TM ## array_value ()); \ if (octave_ ## TI ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated (".\\", v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## TI ::clear_conv_flag (); \ return retval; \ } \ @@ -392,7 +392,7 @@ octave_value retval = octave_value (v2.TM ## array_value () / v1.TS ## scalar_value ()); \ if (octave_ ## TI ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated (".\\", v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## TI ::clear_conv_flag (); \ return retval; \ } @@ -418,8 +418,8 @@ T2 ## NDArray result (b.dims ()); \ for (int i = 0; i < b.length (); i++) \ { \ - OCTAVE_QUIT; \ - result (i) = pow (a, b(i)); \ + OCTAVE_QUIT; \ + result (i) = pow (a, b(i)); \ } \ return octave_value (result); \ } \ @@ -430,8 +430,8 @@ T1 ## NDArray result (b.dims ()); \ for (int i = 0; i < b.length (); i++) \ { \ - OCTAVE_QUIT; \ - result (i) = pow (a, b(i)); \ + OCTAVE_QUIT; \ + result (i) = pow (a, b(i)); \ } \ return octave_value (result); \ } \ @@ -442,8 +442,8 @@ T2 ## NDArray result (b.dims ()); \ for (int i = 0; i < b.length (); i++) \ { \ - OCTAVE_QUIT; \ - result (i) = pow (a, b(i)); \ + OCTAVE_QUIT; \ + result (i) = pow (a, b(i)); \ } \ return octave_value (result); \ } \ @@ -454,8 +454,8 @@ T1 ## NDArray result (b.dims ()); \ for (int i = 0; i < b.length (); i++) \ { \ - OCTAVE_QUIT; \ - result (i) = powf (a, b(i)); \ + OCTAVE_QUIT; \ + result (i) = powf (a, b(i)); \ } \ return octave_value (result); \ } \ @@ -466,8 +466,8 @@ T2 ## NDArray result (b.dims ()); \ for (int i = 0; i < b.length (); i++) \ { \ - OCTAVE_QUIT; \ - result (i) = powf (a, b(i)); \ + OCTAVE_QUIT; \ + result (i) = powf (a, b(i)); \ } \ return octave_value (result); \ } @@ -519,7 +519,7 @@ octave_value retval = octave_value (v1.TM ## array_value () / v2.TS ## scalar_value ()); \ if (octave_ ## TI ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated ("/", v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## TI ::clear_conv_flag (); \ return retval; \ } \ @@ -548,7 +548,7 @@ octave_value retval = octave_value (v1.TM ## array_value () / v2.TS ## scalar_value ()); \ if (octave_ ## TI ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated ("./", v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## TI ::clear_conv_flag (); \ return retval; \ } \ @@ -562,7 +562,7 @@ octave_value retval = v2.TS ## scalar_value () / v1.TM ## array_value (); \ if (octave_ ## TI ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated (".^", v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## TI ::clear_conv_flag (); \ return retval; \ } @@ -597,7 +597,7 @@ for (int i = 0; i < a.length (); i++) \ { \ OCTAVE_QUIT; \ - result (i) = pow (a(i), b); \ + result (i) = pow (a(i), b); \ } \ return octave_value (result); \ } \ @@ -608,7 +608,7 @@ for (int i = 0; i < a.length (); i++) \ { \ OCTAVE_QUIT; \ - result (i) = pow (a(i), b); \ + result (i) = pow (a(i), b); \ } \ return octave_value (result); \ } \ @@ -619,7 +619,7 @@ for (int i = 0; i < a.length (); i++) \ { \ OCTAVE_QUIT; \ - result (i) = pow (a(i), b); \ + result (i) = pow (a(i), b); \ } \ return octave_value (result); \ } \ @@ -630,7 +630,7 @@ for (int i = 0; i < a.length (); i++) \ { \ OCTAVE_QUIT; \ - result (i) = powf (a(i), b); \ + result (i) = powf (a(i), b); \ } \ return octave_value (result); \ } \ @@ -641,7 +641,7 @@ for (int i = 0; i < a.length (); i++) \ { \ OCTAVE_QUIT; \ - result (i) = powf (a(i), b); \ + result (i) = powf (a(i), b); \ } \ return octave_value (result); \ } @@ -690,8 +690,8 @@ \ if (v.ndims () > 2) \ { \ - error ("transpose not defined for N-d objects"); \ - return octave_value (); \ + error ("transpose not defined for N-d objects"); \ + return octave_value (); \ } \ else \ return octave_value (v.TYPE ## _array_value().transpose ()); \ @@ -701,7 +701,7 @@ DEFNCUNOP_METHOD (m_decr, TYPE ## _matrix, decrement) \ DEFNCUNOP_METHOD (m_changesign, TYPE ## _matrix, changesign) -#define OCTAVE_MM_INT_ARITH_OPS(PFX, T1, T2, T3) \ +#define OCTAVE_MM_INT_ARITH_OPS(PFX, T1, T2, T3) \ /* matrix by matrix ops. */ \ \ DEFINTNDBINOP_OP (PFX ## _add, T1 ## matrix, T2 ## matrix, T1 ## array, T2 ## array, +, T3) \ @@ -731,7 +731,7 @@ octave_value retval = octave_value (quotient (v2.T2 ## array_value (), v1.T1 ## array_value ())); \ if (octave_ ## T3 ::get_math_trunc_flag ()) \ gripe_binop_integer_math_truncated (".\\", v1.type_name (). c_str (), \ - v2.type_name (). c_str ()); \ + v2.type_name (). c_str ()); \ octave_ ## T3 ::clear_conv_flag (); \ return retval; \ } @@ -769,14 +769,14 @@ dim_vector b_dims = b.dims (); \ if (a_dims != b_dims) \ { \ - gripe_nonconformant ("operator .^", a_dims, b_dims); \ - return octave_value (); \ + gripe_nonconformant ("operator .^", a_dims, b_dims); \ + return octave_value (); \ } \ T1 ## NDArray result (a_dims); \ for (int i = 0; i < a.length (); i++) \ { \ - OCTAVE_QUIT; \ - result (i) = pow (a(i), b(i)); \ + OCTAVE_QUIT; \ + result (i) = pow (a(i), b(i)); \ } \ return octave_value (result); \ } \ @@ -788,14 +788,14 @@ dim_vector b_dims = b.dims (); \ if (a_dims != b_dims) \ { \ - gripe_nonconformant ("operator .^", a_dims, b_dims); \ - return octave_value (); \ + gripe_nonconformant ("operator .^", a_dims, b_dims); \ + return octave_value (); \ } \ T1 ## NDArray result (a_dims); \ for (int i = 0; i < a.length (); i++) \ { \ - OCTAVE_QUIT; \ - result (i) = pow (a(i), b(i)); \ + OCTAVE_QUIT; \ + result (i) = pow (a(i), b(i)); \ } \ return octave_value (result); \ } \ @@ -807,14 +807,14 @@ dim_vector b_dims = b.dims (); \ if (a_dims != b_dims) \ { \ - gripe_nonconformant ("operator .^", a_dims, b_dims); \ - return octave_value (); \ + gripe_nonconformant ("operator .^", a_dims, b_dims); \ + return octave_value (); \ } \ T2 ## NDArray result (a_dims); \ for (int i = 0; i < a.length (); i++) \ { \ - OCTAVE_QUIT; \ - result (i) = pow (a(i), b(i)); \ + OCTAVE_QUIT; \ + result (i) = pow (a(i), b(i)); \ } \ return octave_value (result); \ } \ @@ -826,14 +826,14 @@ dim_vector b_dims = b.dims (); \ if (a_dims != b_dims) \ { \ - gripe_nonconformant ("operator .^", a_dims, b_dims); \ - return octave_value (); \ + gripe_nonconformant ("operator .^", a_dims, b_dims); \ + return octave_value (); \ } \ T1 ## NDArray result (a_dims); \ for (int i = 0; i < a.length (); i++) \ { \ - OCTAVE_QUIT; \ - result (i) = powf (a(i), b(i)); \ + OCTAVE_QUIT; \ + result (i) = powf (a(i), b(i)); \ } \ return octave_value (result); \ } \ @@ -845,14 +845,14 @@ dim_vector b_dims = b.dims (); \ if (a_dims != b_dims) \ { \ - gripe_nonconformant ("operator .^", a_dims, b_dims); \ - return octave_value (); \ + gripe_nonconformant ("operator .^", a_dims, b_dims); \ + return octave_value (); \ } \ T2 ## NDArray result (a_dims); \ for (int i = 0; i < a.length (); i++) \ { \ - OCTAVE_QUIT; \ - result (i) = powf (a(i), b(i)); \ + OCTAVE_QUIT; \ + result (i) = powf (a(i), b(i)); \ } \ return octave_value (result); \ } @@ -959,10 +959,10 @@ #define OCTAVE_INSTALL_SS_INT_OPS(TYPE) \ OCTAVE_INSTALL_S_INT_UNOPS (TYPE) \ OCTAVE_INSTALL_SS_INT_ARITH_OPS (ss, TYPE ## _, TYPE ## _) \ - OCTAVE_INSTALL_SS_INT_ARITH_OPS (ssx, TYPE ## _, ) \ - OCTAVE_INSTALL_SS_INT_ARITH_OPS (sxs, , TYPE ## _) \ - OCTAVE_INSTALL_SS_INT_ARITH_OPS (ssfx, TYPE ## _, float_) \ - OCTAVE_INSTALL_SS_INT_ARITH_OPS (sfxs, float_, TYPE ## _) \ + OCTAVE_INSTALL_SS_INT_ARITH_OPS (ssx, TYPE ## _, ) \ + OCTAVE_INSTALL_SS_INT_ARITH_OPS (sxs, , TYPE ## _) \ + OCTAVE_INSTALL_SS_INT_ARITH_OPS (ssfx, TYPE ## _, float_) \ + OCTAVE_INSTALL_SS_INT_ARITH_OPS (sfxs, float_, TYPE ## _) \ OCTAVE_INSTALL_SS_INT_CMP_OPS (ss, TYPE ## _, TYPE ## _) \ OCTAVE_INSTALL_SS_INT_CMP_OPS (sx, TYPE ## _, ) \ OCTAVE_INSTALL_SS_INT_CMP_OPS (xs, , TYPE ## _) \ @@ -1007,10 +1007,10 @@ #define OCTAVE_INSTALL_SM_INT_OPS(TYPE) \ OCTAVE_INSTALL_SM_INT_ARITH_OPS (sm, TYPE ## _, TYPE ## _) \ - OCTAVE_INSTALL_SM_INT_ARITH_OPS (smx, TYPE ## _, ) \ - OCTAVE_INSTALL_SM_INT_ARITH_OPS (sxm, , TYPE ## _) \ - OCTAVE_INSTALL_SM_INT_ARITH_OPS (smfx, TYPE ## _, float_) \ - OCTAVE_INSTALL_SM_INT_ARITH_OPS (sfxm, float_, TYPE ## _) \ + OCTAVE_INSTALL_SM_INT_ARITH_OPS (smx, TYPE ## _, ) \ + OCTAVE_INSTALL_SM_INT_ARITH_OPS (sxm, , TYPE ## _) \ + OCTAVE_INSTALL_SM_INT_ARITH_OPS (smfx, TYPE ## _, float_) \ + OCTAVE_INSTALL_SM_INT_ARITH_OPS (sfxm, float_, TYPE ## _) \ OCTAVE_INSTALL_SM_INT_CMP_OPS (sm, TYPE ## _, TYPE ## _) \ OCTAVE_INSTALL_SM_INT_CMP_OPS (xm, , TYPE ## _) \ OCTAVE_INSTALL_SM_INT_CMP_OPS (smx, TYPE ## _, ) \ @@ -1069,9 +1069,9 @@ #define OCTAVE_INSTALL_MS_INT_OPS(TYPE) \ OCTAVE_INSTALL_MS_INT_ARITH_OPS (ms, TYPE ## _, TYPE ## _) \ OCTAVE_INSTALL_MS_INT_ARITH_OPS (msx, TYPE ## _, ) \ - OCTAVE_INSTALL_MS_INT_ARITH_OPS (mxs, , TYPE ## _) \ + OCTAVE_INSTALL_MS_INT_ARITH_OPS (mxs, , TYPE ## _) \ OCTAVE_INSTALL_MS_INT_ARITH_OPS (msfx, TYPE ## _, float_) \ - OCTAVE_INSTALL_MS_INT_ARITH_OPS (mfxs, float_, TYPE ## _) \ + OCTAVE_INSTALL_MS_INT_ARITH_OPS (mfxs, float_, TYPE ## _) \ OCTAVE_INSTALL_MS_INT_CMP_OPS (ms, TYPE ## _, TYPE ## _) \ OCTAVE_INSTALL_MS_INT_CMP_OPS (mx, TYPE ## _, ) \ OCTAVE_INSTALL_MS_INT_CMP_OPS (mxs, , TYPE ## _) \ @@ -1100,7 +1100,7 @@ INSTALL_NCUNOP (op_decr, octave_ ## TYPE ## _matrix, m_decr); \ INSTALL_NCUNOP (op_uminus, octave_ ## TYPE ## _matrix, m_changesign); -#define OCTAVE_INSTALL_MM_INT_ARITH_OPS(PFX, T1, T2) \ +#define OCTAVE_INSTALL_MM_INT_ARITH_OPS(PFX, T1, T2) \ INSTALL_BINOP (op_add, octave_ ## T1 ## matrix, octave_ ## T2 ## matrix, PFX ## _add); \ INSTALL_BINOP (op_sub, octave_ ## T1 ## matrix, octave_ ## T2 ## matrix, PFX ## _sub); \ /* INSTALL_BINOP (op_mul, octave_ ## T1 ## matrix, octave_ ## T2 ## matrix, PFX ## _mul); */ \ @@ -1141,9 +1141,9 @@ OCTAVE_INSTALL_M_INT_UNOPS (TYPE) \ OCTAVE_INSTALL_MM_INT_ARITH_OPS (mm, TYPE ##_, TYPE ## _) \ OCTAVE_INSTALL_MM_INT_ARITH_OPS (mmx, TYPE ##_, ) \ - OCTAVE_INSTALL_MM_INT_ARITH_OPS (mxm, , TYPE ##_) \ + OCTAVE_INSTALL_MM_INT_ARITH_OPS (mxm, , TYPE ##_) \ OCTAVE_INSTALL_MM_INT_ARITH_OPS (mmfx, TYPE ##_, float_) \ - OCTAVE_INSTALL_MM_INT_ARITH_OPS (mfxm, float_, TYPE ##_) \ + OCTAVE_INSTALL_MM_INT_ARITH_OPS (mfxm, float_, TYPE ##_) \ OCTAVE_INSTALL_MM_INT_CMP_OPS (mm, TYPE ## _, TYPE ## _) \ OCTAVE_INSTALL_MM_INT_CMP_OPS (mmx, TYPE ## _, ) \ OCTAVE_INSTALL_MM_INT_CMP_OPS (mxm, , TYPE ## _) \
--- a/src/OPERATORS/op-m-cm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-m-cm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008 John W. Eaton + 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -66,7 +66,7 @@ MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (v1.matrix_value (), - v2.complex_matrix_value (), typ); + v2.complex_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -84,7 +84,7 @@ MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.matrix_value (), - v2.complex_matrix_value (), typ); + v2.complex_matrix_value (), typ); v1.matrix_type (typ); return ret;
--- a/src/OPERATORS/op-m-scm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-m-scm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -56,7 +56,7 @@ Complex d = v2.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v1.array_value () / d); } @@ -65,7 +65,7 @@ MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (v1.matrix_value (), - v2.sparse_complex_matrix_value (), typ); + v2.sparse_complex_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -81,11 +81,11 @@ DEFBINOP (ldiv, matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.matrix_value (), - v2.complex_matrix_value (), typ); + v2.complex_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -104,17 +104,17 @@ DEFBINOP (el_pow, matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); return octave_value (elem_xpow (SparseMatrix (v1.matrix_value ()), - v2.sparse_complex_matrix_value ())); + v2.sparse_complex_matrix_value ())); } DEFBINOP (el_ldiv, matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); return octave_value (quotient (v2.sparse_complex_matrix_value (), v1.matrix_value ())); } @@ -127,7 +127,7 @@ CAST_BINOP_ARGS (octave_matrix&, const octave_sparse_complex_matrix&); SparseMatrix tmp (v1.matrix_value ()); return octave_value (tmp. concat (v2.sparse_complex_matrix_value (), - ra_idx)); + ra_idx)); } DEFCONV (sparse_complex_matrix_conv, matrix, sparse_complex_matrix) @@ -153,25 +153,25 @@ INSTALL_BINOP (op_gt, octave_matrix, octave_sparse_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_matrix, octave_sparse_complex_matrix, ne); INSTALL_BINOP (op_el_mul, octave_matrix, octave_sparse_complex_matrix, - el_mul); + el_mul); INSTALL_BINOP (op_el_div, octave_matrix, octave_sparse_complex_matrix, - el_div); + el_div); INSTALL_BINOP (op_el_pow, octave_matrix, octave_sparse_complex_matrix, - el_pow); + el_pow); INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_sparse_complex_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP (op_el_and, octave_matrix, octave_sparse_complex_matrix, - el_and); + el_and); INSTALL_BINOP (op_el_or, octave_matrix, octave_sparse_complex_matrix, - el_or); + el_or); INSTALL_CATOP (octave_matrix, octave_sparse_complex_matrix, m_scm); INSTALL_ASSIGNCONV (octave_matrix, octave_sparse_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP (octave_matrix, octave_sparse_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); } /*
--- a/src/OPERATORS/op-m-sm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-m-sm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007, 2008 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -55,7 +55,7 @@ double d = v2.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v1.array_value () / d); } @@ -104,7 +104,7 @@ CAST_BINOP_ARGS (const octave_matrix&, const octave_sparse_matrix&); return octave_value (elem_xpow (SparseMatrix (v1.matrix_value ()), - v2.sparse_matrix_value ())); + v2.sparse_matrix_value ())); } DEFBINOP (el_ldiv, matrix, sparse_matrix) @@ -163,7 +163,7 @@ INSTALL_ASSIGNCONV (octave_matrix, octave_sparse_matrix, octave_matrix) INSTALL_WIDENOP (octave_matrix, octave_sparse_matrix, - sparse_matrix_conv); + sparse_matrix_conv); } /*
--- a/src/OPERATORS/op-pm-scm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-pm-scm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -87,11 +87,11 @@ install_pm_scm_ops (void) { INSTALL_BINOP (op_mul, octave_perm_matrix, octave_sparse_complex_matrix, - mul_pm_scm); + mul_pm_scm); INSTALL_BINOP (op_ldiv, octave_perm_matrix, octave_sparse_complex_matrix, - ldiv_pm_scm); + ldiv_pm_scm); INSTALL_BINOP (op_mul, octave_sparse_complex_matrix, octave_perm_matrix, - mul_scm_pm); + mul_scm_pm); INSTALL_BINOP (op_div, octave_sparse_complex_matrix, octave_perm_matrix, - div_scm_pm); + div_scm_pm); }
--- a/src/OPERATORS/op-pm-sm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-pm-sm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -87,11 +87,11 @@ install_pm_sm_ops (void) { INSTALL_BINOP (op_mul, octave_perm_matrix, octave_sparse_matrix, - mul_pm_sm); + mul_pm_sm); INSTALL_BINOP (op_ldiv, octave_perm_matrix, octave_sparse_matrix, - ldiv_pm_sm); + ldiv_pm_sm); INSTALL_BINOP (op_mul, octave_sparse_matrix, octave_perm_matrix, - mul_sm_pm); + mul_sm_pm); INSTALL_BINOP (op_div, octave_sparse_matrix, octave_perm_matrix, - div_sm_pm); + div_sm_pm); }
--- a/src/OPERATORS/op-s-scm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-s-scm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -56,7 +56,7 @@ Complex d = v2.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (SparseComplexMatrix (1, 1, v1.scalar_value () / d)); } @@ -74,14 +74,14 @@ DEFBINOP (pow, scalar, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_scalar&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); return xpow (v1.scalar_value (), v2.complex_matrix_value ()); } DEFBINOP (ldiv, scalar, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_scalar&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); double d = v1.double_value (); octave_value retval; @@ -108,7 +108,7 @@ DEFBINOP (el_ldiv, scalar, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_scalar&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); double d = v1.double_value (); octave_value retval; @@ -156,25 +156,25 @@ INSTALL_BINOP (op_gt, octave_scalar, octave_sparse_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_scalar, octave_sparse_complex_matrix, ne); INSTALL_BINOP (op_el_mul, octave_scalar, octave_sparse_complex_matrix, - el_mul); + el_mul); INSTALL_BINOP (op_el_div, octave_scalar, octave_sparse_complex_matrix, - el_div); + el_div); INSTALL_BINOP (op_el_pow, octave_scalar, octave_sparse_complex_matrix, - el_pow); + el_pow); INSTALL_BINOP (op_el_ldiv, octave_scalar, octave_sparse_complex_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP (op_el_and, octave_scalar, octave_sparse_complex_matrix, - el_and); + el_and); INSTALL_BINOP (op_el_or, octave_scalar, octave_sparse_complex_matrix, - el_or); + el_or); INSTALL_CATOP (octave_scalar, octave_sparse_complex_matrix, s_scm); INSTALL_ASSIGNCONV (octave_scalar, octave_sparse_complex_matrix, - octave_complex_matrix); + octave_complex_matrix); INSTALL_WIDENOP (octave_scalar, octave_sparse_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); } /*
--- a/src/OPERATORS/op-s-sm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-s-sm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -52,7 +52,7 @@ double d = v2.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (SparseMatrix (1, 1, v1.scalar_value () / d)); }
--- a/src/OPERATORS/op-sbm-b.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-sbm-b.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2007, 2008 David Bateman +Copyright (C) 2004, 2005, 2007, 2008, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -47,7 +47,7 @@ DEFCATOP (sbm_b, sparse_bool_matrix, bool) { CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_bool&); - + SparseBoolMatrix tmp (1, 1, v2.bool_value ()); return octave_value (v1.sparse_bool_matrix_value (). concat (tmp, ra_idx)); } @@ -55,7 +55,7 @@ DEFCATOP (sm_b, sparse_matrix, bool) { CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_bool&); - + SparseMatrix tmp (1, 1, v2.scalar_value ()); return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); } @@ -63,7 +63,7 @@ DEFCATOP (sbm_s, sparse_bool_matrix, scalar) { CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_scalar&); - + SparseMatrix tmp (1, 1, v2.scalar_value ()); return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); }
--- a/src/OPERATORS/op-sbm-bm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-sbm-bm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2007, 2008 David Bateman +Copyright (C) 2004, 2005, 2007, 2008, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -50,7 +50,7 @@ DEFCATOP (sbm_bm, sparse_bool_matrix, bool_matrix) { CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_bool_matrix&); - + SparseBoolMatrix tmp (v2.bool_matrix_value ()); return octave_value (v1.sparse_bool_matrix_value (). concat (tmp, ra_idx)); } @@ -58,7 +58,7 @@ DEFCATOP (sbm_m, sparse_bool_matrix, matrix) { CAST_BINOP_ARGS (octave_sparse_bool_matrix&, const octave_matrix&); - + SparseMatrix tmp (v2.matrix_value ()); return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); } @@ -66,7 +66,7 @@ DEFCATOP (sm_bm, sparse_matrix, bool_matrix) { CAST_BINOP_ARGS (octave_sparse_matrix&, const octave_bool_matrix&); - + SparseMatrix tmp (v2.matrix_value ()); return octave_value (v1.sparse_matrix_value (). concat (tmp, ra_idx)); } @@ -86,16 +86,16 @@ INSTALL_BINOP (op_ne, octave_sparse_bool_matrix, octave_bool_matrix, ne); INSTALL_BINOP (op_el_and, octave_sparse_bool_matrix, octave_bool_matrix, - el_and); + el_and); INSTALL_BINOP (op_el_or, octave_sparse_bool_matrix, octave_bool_matrix, - el_or); + el_or); INSTALL_CATOP (octave_sparse_bool_matrix, octave_bool_matrix, sbm_bm); INSTALL_CATOP (octave_sparse_matrix, octave_bool_matrix, sm_bm); INSTALL_CATOP (octave_sparse_bool_matrix, octave_matrix, sbm_m); INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, - octave_bool_matrix, assign); + octave_bool_matrix, assign); } /*
--- a/src/OPERATORS/op-sbm-sbm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-sbm-sbm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2007 David Bateman +Copyright (C) 2004, 2005, 2007, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -66,14 +66,14 @@ DEFBINOP_FN (el_or, sparse_bool_matrix, sparse_bool_matrix, mx_el_or) DEFNDCATOP_FN (sbm_sbm, sparse_bool_matrix, sparse_bool_matrix, - sparse_bool_matrix, sparse_bool_matrix, concat) + sparse_bool_matrix, sparse_bool_matrix, concat) DEFNDCATOP_FN (sbm_sm, sparse_bool_matrix, sparse_matrix, sparse_matrix, - sparse_matrix, concat) + sparse_matrix, concat) DEFNDCATOP_FN (sm_sbm, sparse_matrix, sparse_bool_matrix, sparse_matrix, - sparse_matrix, concat) + sparse_matrix, concat) DEFASSIGNOP_FN (assign, sparse_bool_matrix, sparse_bool_matrix, - assign) + assign) CONVDECL (bool_matrix_to_double_matrix) { @@ -92,25 +92,25 @@ INSTALL_UNOP (op_hermitian, octave_sparse_bool_matrix, transpose); INSTALL_BINOP (op_eq, octave_sparse_bool_matrix, - octave_sparse_bool_matrix, eq); + octave_sparse_bool_matrix, eq); INSTALL_BINOP (op_ne, octave_sparse_bool_matrix, - octave_sparse_bool_matrix, ne); + octave_sparse_bool_matrix, ne); INSTALL_BINOP (op_el_and, octave_sparse_bool_matrix, - octave_sparse_bool_matrix, el_and); + octave_sparse_bool_matrix, el_and); INSTALL_BINOP (op_el_or, octave_sparse_bool_matrix, - octave_sparse_bool_matrix, el_or); + octave_sparse_bool_matrix, el_or); INSTALL_CATOP (octave_sparse_bool_matrix, octave_sparse_bool_matrix, - sbm_sbm); + sbm_sbm); INSTALL_CATOP (octave_sparse_bool_matrix, octave_sparse_matrix, sbm_sm); INSTALL_CATOP (octave_sparse_matrix, octave_sparse_bool_matrix, sm_sbm); INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_bool_matrix, - octave_sparse_bool_matrix, assign); + octave_sparse_bool_matrix, assign); INSTALL_CONVOP (octave_sparse_bool_matrix, octave_sparse_matrix, - bool_matrix_to_double_matrix); + bool_matrix_to_double_matrix); } /*
--- a/src/OPERATORS/op-scm-cm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-scm-cm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007, 2008 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -49,11 +49,11 @@ DEFBINOP (div, sparse_complex_matrix, complex_matrix) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_complex_matrix&); + const octave_complex_matrix&); MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (v1.complex_matrix_value (), - v2.complex_matrix_value (), typ); + v2.complex_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -74,7 +74,7 @@ Complex d = v1.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v2.complex_array_value () / d); } @@ -83,7 +83,7 @@ MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.sparse_complex_matrix_value (), - v2.complex_matrix_value (), typ); + v2.complex_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -106,20 +106,20 @@ DEFBINOP (el_pow, sparse_complex_matrix, complex_matrix) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_complex_matrix&); + const octave_complex_matrix&); return octave_value (elem_xpow (v1.sparse_complex_matrix_value (), SparseComplexMatrix - (v2.complex_matrix_value ()))); + (v2.complex_matrix_value ()))); } DEFBINOP (el_ldiv, sparse_complex_matrix, matrix) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_complex_matrix&); + const octave_complex_matrix&); return octave_value (quotient (v2.complex_matrix_value (), - v1.sparse_complex_matrix_value ())); + v1.sparse_complex_matrix_value ())); } DEFBINOP_FN (el_and, sparse_complex_matrix, complex_matrix, mx_el_and) @@ -128,7 +128,7 @@ DEFCATOP (scm_cm, sparse_complex_matrix, complex_matrix) { CAST_BINOP_ARGS (octave_sparse_complex_matrix&, - const octave_complex_matrix&); + const octave_complex_matrix&); SparseComplexMatrix tmp (v2.complex_matrix_value ()); return octave_value (v1.sparse_complex_matrix_value (). concat (tmp, ra_idx)); @@ -137,7 +137,7 @@ DEFASSIGNOP (assign, sparse_complex_matrix, complex_matrix) { CAST_BINOP_ARGS (octave_sparse_complex_matrix&, - const octave_complex_matrix&); + const octave_complex_matrix&); SparseComplexMatrix tmp (v2.complex_matrix_value ()); v1.assign (idx, tmp); @@ -148,51 +148,51 @@ install_scm_cm_ops (void) { INSTALL_BINOP (op_add, octave_sparse_complex_matrix, - octave_complex_matrix, add); + octave_complex_matrix, add); INSTALL_BINOP (op_sub, octave_sparse_complex_matrix, - octave_complex_matrix, sub); + octave_complex_matrix, sub); INSTALL_BINOP (op_mul, octave_sparse_complex_matrix, - octave_complex_matrix, mul); + octave_complex_matrix, mul); INSTALL_BINOP (op_div, octave_sparse_complex_matrix, - octave_complex_matrix, div); + octave_complex_matrix, div); INSTALL_BINOP (op_pow, octave_sparse_complex_matrix, - octave_complex_matrix, pow); + octave_complex_matrix, pow); INSTALL_BINOP (op_ldiv, octave_sparse_complex_matrix, - octave_complex_matrix, ldiv); + octave_complex_matrix, ldiv); INSTALL_BINOP (op_trans_mul, octave_sparse_complex_matrix, octave_complex_matrix, trans_mul); INSTALL_BINOP (op_herm_mul, octave_sparse_complex_matrix, octave_complex_matrix, herm_mul); INSTALL_BINOP (op_lt, octave_sparse_complex_matrix, - octave_complex_matrix, lt); + octave_complex_matrix, lt); INSTALL_BINOP (op_le, octave_sparse_complex_matrix, - octave_complex_matrix, le); + octave_complex_matrix, le); INSTALL_BINOP (op_eq, octave_sparse_complex_matrix, - octave_complex_matrix, eq); + octave_complex_matrix, eq); INSTALL_BINOP (op_ge, octave_sparse_complex_matrix, - octave_complex_matrix, ge); + octave_complex_matrix, ge); INSTALL_BINOP (op_gt, octave_sparse_complex_matrix, - octave_complex_matrix, gt); + octave_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_sparse_complex_matrix, - octave_complex_matrix, ne); + octave_complex_matrix, ne); INSTALL_BINOP (op_el_mul, octave_sparse_complex_matrix, - octave_complex_matrix, el_mul); + octave_complex_matrix, el_mul); INSTALL_BINOP (op_el_div, octave_sparse_complex_matrix, - octave_complex_matrix, el_div); + octave_complex_matrix, el_div); INSTALL_BINOP (op_el_pow, octave_sparse_complex_matrix, - octave_complex_matrix, el_pow); + octave_complex_matrix, el_pow); INSTALL_BINOP (op_el_ldiv, octave_sparse_complex_matrix, - octave_complex_matrix, el_ldiv); + octave_complex_matrix, el_ldiv); INSTALL_BINOP (op_el_and, octave_sparse_complex_matrix, - octave_complex_matrix, el_and); + octave_complex_matrix, el_and); INSTALL_BINOP (op_el_or, octave_sparse_complex_matrix, - octave_complex_matrix, el_or); + octave_complex_matrix, el_or); INSTALL_CATOP (octave_sparse_complex_matrix, - octave_complex_matrix, scm_cm); + octave_complex_matrix, scm_cm); INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix, - octave_complex_matrix, assign); + octave_complex_matrix, assign); } /*
--- a/src/OPERATORS/op-scm-cs.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-scm-cs.cc Mon Dec 07 14:49:48 2009 -0500 @@ -47,7 +47,7 @@ DEFBINOP (div, sparse_complex_matrix, complex) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_complex&); + const octave_complex&); Complex d = v2.complex_value (); octave_value retval; @@ -63,7 +63,7 @@ DEFBINOP (pow, sparse_complex_matrix, complex) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_complex&); + const octave_complex&); return xpow (v1.complex_matrix_value (), v2.complex_value ()); } @@ -76,7 +76,7 @@ Complex d = v1.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (SparseComplexMatrix (1, 1, v2.complex_value () / d)); } @@ -103,7 +103,7 @@ DEFBINOP (el_div, sparse_complex_matrix, complex) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_complex&); + const octave_complex&); octave_value retval; @@ -122,7 +122,7 @@ DEFBINOP (el_ldiv, sparse_complex_matrix, complex) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_complex&); + const octave_complex&); return octave_value (x_el_div (v2.complex_value (), v1.sparse_complex_matrix_value ())); @@ -157,7 +157,7 @@ INSTALL_BINOP (op_div, octave_sparse_complex_matrix, octave_complex, div); INSTALL_BINOP (op_pow, octave_sparse_complex_matrix, octave_complex, pow); INSTALL_BINOP (op_ldiv, octave_sparse_complex_matrix, octave_complex, - ldiv); + ldiv); INSTALL_BINOP (op_lt, octave_sparse_complex_matrix, octave_complex, lt); INSTALL_BINOP (op_le, octave_sparse_complex_matrix, octave_complex, le); INSTALL_BINOP (op_eq, octave_sparse_complex_matrix, octave_complex, eq); @@ -165,22 +165,22 @@ INSTALL_BINOP (op_gt, octave_sparse_complex_matrix, octave_complex, gt); INSTALL_BINOP (op_ne, octave_sparse_complex_matrix, octave_complex, ne); INSTALL_BINOP (op_el_mul, octave_sparse_complex_matrix, octave_complex, - el_mul); + el_mul); INSTALL_BINOP (op_el_div, octave_sparse_complex_matrix, octave_complex, - el_div); + el_div); INSTALL_BINOP (op_el_pow, octave_sparse_complex_matrix, octave_complex, - el_pow); + el_pow); INSTALL_BINOP (op_el_ldiv, octave_sparse_complex_matrix, octave_complex, - el_ldiv); + el_ldiv); INSTALL_BINOP (op_el_and, octave_sparse_complex_matrix, octave_complex, - el_and); + el_and); INSTALL_BINOP (op_el_or, octave_sparse_complex_matrix, octave_complex, - el_or); + el_or); INSTALL_CATOP (octave_sparse_complex_matrix, octave_complex, scm_cs); INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix, octave_complex, - assign); + assign); } /*
--- a/src/OPERATORS/op-scm-m.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-scm-m.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -54,7 +54,7 @@ MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (v1.complex_matrix_value (), - v2.matrix_value (), typ); + v2.matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -75,7 +75,7 @@ Complex d = v1.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v2.array_value () / d); } @@ -84,7 +84,7 @@ MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.sparse_complex_matrix_value (), - v2.matrix_value (), typ); + v2.matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -104,17 +104,17 @@ DEFBINOP (el_pow, sparse_complex_matrix, matrix) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_matrix&); + const octave_matrix&); return octave_value (elem_xpow (v1.sparse_complex_matrix_value (), SparseMatrix - (v2.matrix_value ()))); + (v2.matrix_value ()))); } DEFBINOP (el_ldiv, sparse_complex_matrix, matrix) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_matrix&); + const octave_matrix&); return octave_value (quotient (v2.matrix_value (), v1.sparse_complex_matrix_value ())); @@ -156,22 +156,22 @@ INSTALL_BINOP (op_gt, octave_sparse_complex_matrix, octave_matrix, gt); INSTALL_BINOP (op_ne, octave_sparse_complex_matrix, octave_matrix, ne); INSTALL_BINOP (op_el_mul, octave_sparse_complex_matrix, octave_matrix, - el_mul); + el_mul); INSTALL_BINOP (op_el_div, octave_sparse_complex_matrix, octave_matrix, - el_div); + el_div); INSTALL_BINOP (op_el_pow, octave_sparse_complex_matrix, octave_matrix, - el_pow); + el_pow); INSTALL_BINOP (op_el_ldiv, octave_sparse_complex_matrix, octave_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP (op_el_and, octave_sparse_complex_matrix, octave_matrix, - el_and); + el_and); INSTALL_BINOP (op_el_or, octave_sparse_complex_matrix, octave_matrix, - el_or); + el_or); INSTALL_CATOP (octave_sparse_complex_matrix, octave_matrix, scm_m); INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix, octave_matrix, - assign); + assign); } /*
--- a/src/OPERATORS/op-scm-s.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-scm-s.cc Mon Dec 07 14:49:48 2009 -0500 @@ -50,7 +50,7 @@ DEFBINOP (div, sparse_complex_matrix, scalar) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_scalar&); + const octave_scalar&); double d = v2.double_value (); octave_value retval; @@ -66,7 +66,7 @@ DEFBINOP (pow, sparse_complex_matrix, scalar) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_scalar&); + const octave_scalar&); double tmp = v2.scalar_value (); if (static_cast<int> (tmp) == tmp) @@ -84,7 +84,7 @@ Complex d = v1.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (SparseComplexMatrix (1, 1, v2.scalar_value () / d)); } @@ -111,7 +111,7 @@ DEFBINOP (el_div, sparse_complex_matrix, scalar) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_scalar&); + const octave_scalar&); double d = v2.double_value (); octave_value retval; @@ -170,22 +170,22 @@ INSTALL_BINOP (op_gt, octave_sparse_complex_matrix, octave_scalar, gt); INSTALL_BINOP (op_ne, octave_sparse_complex_matrix, octave_scalar, ne); INSTALL_BINOP (op_el_mul, octave_sparse_complex_matrix, octave_scalar, - el_mul); + el_mul); INSTALL_BINOP (op_el_div, octave_sparse_complex_matrix, octave_scalar, - el_div); + el_div); INSTALL_BINOP (op_el_pow, octave_sparse_complex_matrix, octave_scalar, - el_pow); + el_pow); INSTALL_BINOP (op_el_ldiv, octave_sparse_complex_matrix, octave_scalar, - el_ldiv); + el_ldiv); INSTALL_BINOP (op_el_and, octave_sparse_complex_matrix, octave_scalar, - el_and); + el_and); INSTALL_BINOP (op_el_or, octave_sparse_complex_matrix, octave_scalar, - el_or); + el_or); INSTALL_CATOP (octave_sparse_complex_matrix, octave_scalar, scm_s); INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix, octave_scalar, - assign); + assign); } /*
--- a/src/OPERATORS/op-scm-scm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-scm-scm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007, 2008 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -98,14 +98,14 @@ DEFBINOP (div, sparse_complex_matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); if (v2.rows() == 1 && v2.columns() == 1) { Complex d = v2.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v1.sparse_complex_matrix_value () / d); } @@ -113,7 +113,7 @@ { MatrixType typ = v2.matrix_type (); SparseComplexMatrix ret = xdiv (v1.sparse_complex_matrix_value (), - v2.sparse_complex_matrix_value (), typ); + v2.sparse_complex_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -129,14 +129,14 @@ DEFBINOP (ldiv, sparse_complex_matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); if (v1.rows() == 1 && v1.columns() == 1) { Complex d = v1.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v2.sparse_complex_matrix_value () / d); } @@ -145,8 +145,8 @@ MatrixType typ = v1.matrix_type (); SparseComplexMatrix ret = - xleftdiv (v1.sparse_complex_matrix_value (), - v2.sparse_complex_matrix_value (), typ); + xleftdiv (v1.sparse_complex_matrix_value (), + v2.sparse_complex_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -167,10 +167,10 @@ DEFBINOP (el_ldiv, sparse_complex_matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); return octave_value (quotient (v2.sparse_complex_matrix_value (), - v1.sparse_complex_matrix_value ())); + v1.sparse_complex_matrix_value ())); } DEFBINOP_FN (el_and, sparse_complex_matrix, sparse_complex_matrix, mx_el_and) @@ -197,47 +197,47 @@ #endif INSTALL_BINOP (op_add, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, add); + octave_sparse_complex_matrix, add); INSTALL_BINOP (op_sub, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, sub); + octave_sparse_complex_matrix, sub); INSTALL_BINOP (op_mul, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, mul); + octave_sparse_complex_matrix, mul); INSTALL_BINOP (op_div, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, div); + octave_sparse_complex_matrix, div); INSTALL_BINOP (op_pow, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, pow); + octave_sparse_complex_matrix, pow); INSTALL_BINOP (op_ldiv, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, ldiv); + octave_sparse_complex_matrix, ldiv); INSTALL_BINOP (op_lt, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, lt); + octave_sparse_complex_matrix, lt); INSTALL_BINOP (op_le, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, le); + octave_sparse_complex_matrix, le); INSTALL_BINOP (op_eq, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, eq); + octave_sparse_complex_matrix, eq); INSTALL_BINOP (op_ge, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, ge); + octave_sparse_complex_matrix, ge); INSTALL_BINOP (op_gt, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, gt); + octave_sparse_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, ne); + octave_sparse_complex_matrix, ne); INSTALL_BINOP (op_el_mul, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, el_mul); + octave_sparse_complex_matrix, el_mul); INSTALL_BINOP (op_el_div, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, el_div); + octave_sparse_complex_matrix, el_div); INSTALL_BINOP (op_el_pow, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, el_pow); + octave_sparse_complex_matrix, el_pow); INSTALL_BINOP (op_el_ldiv, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, el_ldiv); + octave_sparse_complex_matrix, el_ldiv); INSTALL_BINOP (op_el_and, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, el_and); + octave_sparse_complex_matrix, el_and); INSTALL_BINOP (op_el_or, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, el_or); + octave_sparse_complex_matrix, el_or); INSTALL_CATOP (octave_sparse_complex_matrix, - octave_sparse_complex_matrix, scm_scm); + octave_sparse_complex_matrix, scm_scm); INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix, - octave_sparse_complex_matrix, assign); + octave_sparse_complex_matrix, assign); INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix, octave_null_matrix, null_assign);
--- a/src/OPERATORS/op-scm-sm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-scm-sm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -54,7 +54,7 @@ double d = v2.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v1.sparse_complex_matrix_value () / d); } @@ -62,7 +62,7 @@ { MatrixType typ = v2.matrix_type (); SparseComplexMatrix ret = xdiv (v1.sparse_complex_matrix_value (), - v2.sparse_matrix_value (), typ); + v2.sparse_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -84,7 +84,7 @@ Complex d = v1.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v2.sparse_matrix_value () / d); } @@ -93,7 +93,7 @@ MatrixType typ = v1.matrix_type (); SparseComplexMatrix ret = xleftdiv (v1.sparse_complex_matrix_value (), - v2.sparse_matrix_value (), typ); + v2.sparse_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -114,7 +114,7 @@ DEFBINOP (el_ldiv, sparse_complex_matrix, sparse_matrix) { CAST_BINOP_ARGS (const octave_sparse_complex_matrix&, - const octave_sparse_matrix&); + const octave_sparse_matrix&); return octave_value (quotient (v2.sparse_matrix_value (), v1.sparse_complex_matrix_value ())); @@ -131,46 +131,46 @@ install_scm_sm_ops (void) { INSTALL_BINOP (op_add, octave_sparse_complex_matrix, octave_sparse_matrix, - add); + add); INSTALL_BINOP (op_sub, octave_sparse_complex_matrix, octave_sparse_matrix, - sub); + sub); INSTALL_BINOP (op_mul, octave_sparse_complex_matrix, octave_sparse_matrix, - mul); + mul); INSTALL_BINOP (op_div, octave_sparse_complex_matrix, octave_sparse_matrix, - div); + div); INSTALL_BINOP (op_pow, octave_sparse_complex_matrix, octave_sparse_matrix, - pow); + pow); INSTALL_BINOP (op_ldiv, octave_sparse_complex_matrix, octave_sparse_matrix, - ldiv); + ldiv); INSTALL_BINOP (op_lt, octave_sparse_complex_matrix, octave_sparse_matrix, - lt); + lt); INSTALL_BINOP (op_le, octave_sparse_complex_matrix, octave_sparse_matrix, - le); + le); INSTALL_BINOP (op_eq, octave_sparse_complex_matrix, octave_sparse_matrix, - eq); + eq); INSTALL_BINOP (op_ge, octave_sparse_complex_matrix, octave_sparse_matrix, - ge); + ge); INSTALL_BINOP (op_gt, octave_sparse_complex_matrix, octave_sparse_matrix, - gt); + gt); INSTALL_BINOP (op_ne, octave_sparse_complex_matrix, octave_sparse_matrix, - ne); + ne); INSTALL_BINOP (op_el_mul, octave_sparse_complex_matrix, - octave_sparse_matrix, el_mul); + octave_sparse_matrix, el_mul); INSTALL_BINOP (op_el_div, octave_sparse_complex_matrix, - octave_sparse_matrix, el_div); + octave_sparse_matrix, el_div); INSTALL_BINOP (op_el_pow, octave_sparse_complex_matrix, - octave_sparse_matrix, el_pow); + octave_sparse_matrix, el_pow); INSTALL_BINOP (op_el_ldiv, octave_sparse_complex_matrix, - octave_sparse_matrix, el_ldiv); + octave_sparse_matrix, el_ldiv); INSTALL_BINOP (op_el_and, octave_sparse_complex_matrix, - octave_sparse_matrix, el_and); + octave_sparse_matrix, el_and); INSTALL_BINOP (op_el_or, octave_sparse_complex_matrix, - octave_sparse_matrix, el_or); + octave_sparse_matrix, el_or); INSTALL_CATOP (octave_sparse_complex_matrix, octave_sparse_matrix, scm_sm); INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_complex_matrix, - octave_sparse_matrix, assign); + octave_sparse_matrix, assign); } /*
--- a/src/OPERATORS/op-sm-cm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-sm-cm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -49,11 +49,11 @@ DEFBINOP (div, sparse_matrix, complex_matrix) { CAST_BINOP_ARGS (const octave_sparse_matrix&, - const octave_complex_matrix&); + const octave_complex_matrix&); MatrixType typ = v2.matrix_type (); ComplexMatrix ret = xdiv (v1.matrix_value (), - v2.complex_matrix_value (), typ); + v2.complex_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -74,7 +74,7 @@ double d = v1.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v2.complex_array_value () / d); } @@ -83,7 +83,7 @@ MatrixType typ = v1.matrix_type (); ComplexMatrix ret = xleftdiv (v1.sparse_matrix_value (), - v2.complex_matrix_value (), typ); + v2.complex_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -103,17 +103,17 @@ DEFBINOP (el_pow, sparse_matrix, complex_matrix) { CAST_BINOP_ARGS (const octave_sparse_matrix&, - const octave_complex_matrix&); + const octave_complex_matrix&); return octave_value (elem_xpow (v1.sparse_matrix_value (), SparseComplexMatrix - (v2.complex_matrix_value ()))); + (v2.complex_matrix_value ()))); } DEFBINOP (el_ldiv, sparse_matrix, complex_matrix) { CAST_BINOP_ARGS (const octave_sparse_matrix&, - const octave_complex_matrix&); + const octave_complex_matrix&); return octave_value (quotient (v2.complex_matrix_value (), v1.sparse_matrix_value ())); @@ -151,25 +151,25 @@ INSTALL_BINOP (op_gt, octave_sparse_matrix, octave_complex_matrix, gt); INSTALL_BINOP (op_ne, octave_sparse_matrix, octave_complex_matrix, ne); INSTALL_BINOP (op_el_mul, octave_sparse_matrix, octave_complex_matrix, - el_mul); + el_mul); INSTALL_BINOP (op_el_div, octave_sparse_matrix, octave_complex_matrix, - el_div); + el_div); INSTALL_BINOP (op_el_pow, octave_sparse_matrix, octave_complex_matrix, - el_pow); + el_pow); INSTALL_BINOP (op_el_ldiv, octave_sparse_matrix, octave_complex_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP (op_el_and, octave_sparse_matrix, octave_complex_matrix, - el_and); + el_and); INSTALL_BINOP (op_el_or, octave_sparse_matrix, octave_complex_matrix, - el_or); + el_or); INSTALL_CATOP (octave_sparse_matrix, octave_complex_matrix, sm_cm); INSTALL_ASSIGNCONV (octave_sparse_matrix, octave_complex_matrix, - octave_sparse_complex_matrix); + octave_sparse_complex_matrix); INSTALL_WIDENOP (octave_sparse_matrix, octave_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); } /*
--- a/src/OPERATORS/op-sm-cs.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-sm-cs.cc Mon Dec 07 14:49:48 2009 -0500 @@ -76,7 +76,7 @@ double d = v1.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (SparseComplexMatrix (1, 1, v2.complex_value () / d)); } @@ -122,7 +122,7 @@ CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_complex&); return octave_value (x_el_div (v2.complex_value (), - v1.sparse_matrix_value ())); + v1.sparse_matrix_value ())); } DEFBINOP_FN (el_and, sparse_matrix, complex, mx_el_and) @@ -161,7 +161,7 @@ INSTALL_CATOP (octave_sparse_matrix, octave_complex, sm_cs); INSTALL_ASSIGNCONV (octave_sparse_matrix, octave_complex, - octave_sparse_complex_matrix); + octave_sparse_complex_matrix); } /*
--- a/src/OPERATORS/op-sm-m.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-sm-m.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007, 2008 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -72,7 +72,7 @@ double d = v1.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v2.array_value () / d); } @@ -81,7 +81,7 @@ MatrixType typ = v1.matrix_type (); Matrix ret = xleftdiv (v1.sparse_matrix_value (), - v2.matrix_value (), typ); + v2.matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -105,7 +105,7 @@ CAST_BINOP_ARGS (const octave_sparse_matrix&, const octave_matrix&); return octave_value (elem_xpow (v1.sparse_matrix_value (), - SparseMatrix (v2.matrix_value ()))); + SparseMatrix (v2.matrix_value ()))); } DEFBINOP (el_ldiv, sparse_matrix, matrix)
--- a/src/OPERATORS/op-sm-s.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-sm-s.cc Mon Dec 07 14:49:48 2009 -0500 @@ -78,7 +78,7 @@ double d = v1.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (SparseMatrix(1, 1, v2.scalar_value () / d)); }
--- a/src/OPERATORS/op-sm-scm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-sm-scm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -54,7 +54,7 @@ Complex d = v2.complex_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v1.sparse_matrix_value () / d); } @@ -62,7 +62,7 @@ { MatrixType typ = v2.matrix_type (); SparseComplexMatrix ret = xdiv (v1.sparse_matrix_value (), - v2.sparse_complex_matrix_value (), typ); + v2.sparse_complex_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -84,7 +84,7 @@ double d = v1.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v2.sparse_complex_matrix_value () / d); } @@ -93,8 +93,8 @@ MatrixType typ = v1.matrix_type (); SparseComplexMatrix ret = - xleftdiv (v1.sparse_matrix_value (), - v2.sparse_complex_matrix_value (), typ); + xleftdiv (v1.sparse_matrix_value (), + v2.sparse_complex_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -115,7 +115,7 @@ DEFBINOP (el_ldiv, sparse_matrix, sparse_complex_matrix) { CAST_BINOP_ARGS (const octave_sparse_matrix&, - const octave_sparse_complex_matrix&); + const octave_sparse_complex_matrix&); return octave_value (quotient (v2.sparse_complex_matrix_value (), v1.sparse_matrix_value ())); @@ -136,49 +136,49 @@ install_sm_scm_ops (void) { INSTALL_BINOP (op_add, octave_sparse_matrix, octave_sparse_complex_matrix, - add); + add); INSTALL_BINOP (op_sub, octave_sparse_matrix, octave_sparse_complex_matrix, - sub); + sub); INSTALL_BINOP (op_mul, octave_sparse_matrix, octave_sparse_complex_matrix, - mul); + mul); INSTALL_BINOP (op_div, octave_sparse_matrix, octave_sparse_complex_matrix, - div); + div); INSTALL_BINOP (op_pow, octave_sparse_matrix, octave_sparse_complex_matrix, - pow); + pow); INSTALL_BINOP (op_ldiv, octave_sparse_matrix, octave_sparse_complex_matrix, - ldiv); + ldiv); INSTALL_BINOP (op_lt, octave_sparse_matrix, octave_sparse_complex_matrix, - lt); + lt); INSTALL_BINOP (op_le, octave_sparse_matrix, octave_sparse_complex_matrix, - le); + le); INSTALL_BINOP (op_eq, octave_sparse_matrix, octave_sparse_complex_matrix, - eq); + eq); INSTALL_BINOP (op_ge, octave_sparse_matrix, octave_sparse_complex_matrix, - ge); + ge); INSTALL_BINOP (op_gt, octave_sparse_matrix, octave_sparse_complex_matrix, - gt); + gt); INSTALL_BINOP (op_ne, octave_sparse_matrix, octave_sparse_complex_matrix, - ne); + ne); INSTALL_BINOP (op_el_mul, octave_sparse_matrix, - octave_sparse_complex_matrix, el_mul); + octave_sparse_complex_matrix, el_mul); INSTALL_BINOP (op_el_div, octave_sparse_matrix, - octave_sparse_complex_matrix, el_div); + octave_sparse_complex_matrix, el_div); INSTALL_BINOP (op_el_pow, octave_sparse_matrix, - octave_sparse_complex_matrix, el_pow); + octave_sparse_complex_matrix, el_pow); INSTALL_BINOP (op_el_ldiv, octave_sparse_matrix, - octave_sparse_complex_matrix, el_ldiv); + octave_sparse_complex_matrix, el_ldiv); INSTALL_BINOP (op_el_and, octave_sparse_matrix, - octave_sparse_complex_matrix, el_and); + octave_sparse_complex_matrix, el_and); INSTALL_BINOP (op_el_or, octave_sparse_matrix, - octave_sparse_complex_matrix, el_or); + octave_sparse_complex_matrix, el_or); INSTALL_CATOP (octave_sparse_matrix, octave_sparse_complex_matrix, sm_scm); INSTALL_ASSIGNCONV (octave_sparse_matrix, octave_sparse_complex_matrix, - octave_sparse_complex_matrix); + octave_sparse_complex_matrix); INSTALL_WIDENOP (octave_sparse_matrix, octave_sparse_complex_matrix, - sparse_complex_matrix_conv); + sparse_complex_matrix_conv); } /*
--- a/src/OPERATORS/op-sm-sm.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-sm-sm.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2004, 2005, 2006, 2007, 2008 David Bateman +Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 David Bateman Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Andy Adler This file is part of Octave. @@ -47,7 +47,7 @@ { CAST_UNOP_ARG (const octave_sparse_matrix&); return octave_value (v.sparse_matrix_value().transpose (), - v.matrix_type ().transpose ()); + v.matrix_type ().transpose ()); } // sparse matrix by sparse matrix ops. @@ -77,7 +77,7 @@ double d = v2.scalar_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v1.sparse_matrix_value () / d); } @@ -85,7 +85,7 @@ { MatrixType typ = v2.matrix_type (); SparseMatrix ret = xdiv (v1.sparse_matrix_value (), - v2.sparse_matrix_value (), typ); + v2.sparse_matrix_value (), typ); v2.matrix_type (typ); return ret; @@ -107,7 +107,7 @@ double d = v1.double_value (); if (d == 0.0) - gripe_divide_by_zero (); + gripe_divide_by_zero (); return octave_value (v2.sparse_matrix_value () / d); } @@ -116,7 +116,7 @@ MatrixType typ = v1.matrix_type (); SparseMatrix ret = xleftdiv (v1.sparse_matrix_value (), - v2.sparse_matrix_value (), typ); + v2.sparse_matrix_value (), typ); v1.matrix_type (typ); return ret; @@ -173,22 +173,22 @@ INSTALL_BINOP (op_gt, octave_sparse_matrix, octave_sparse_matrix, gt); INSTALL_BINOP (op_ne, octave_sparse_matrix, octave_sparse_matrix, ne); INSTALL_BINOP (op_el_mul, octave_sparse_matrix, octave_sparse_matrix, - el_mul); + el_mul); INSTALL_BINOP (op_el_div, octave_sparse_matrix, octave_sparse_matrix, - el_div); + el_div); INSTALL_BINOP (op_el_pow, octave_sparse_matrix, octave_sparse_matrix, - el_pow); + el_pow); INSTALL_BINOP (op_el_ldiv, octave_sparse_matrix, octave_sparse_matrix, - el_ldiv); + el_ldiv); INSTALL_BINOP (op_el_and, octave_sparse_matrix, octave_sparse_matrix, - el_and); + el_and); INSTALL_BINOP (op_el_or, octave_sparse_matrix, octave_sparse_matrix, - el_or); + el_or); INSTALL_CATOP (octave_sparse_matrix, octave_sparse_matrix, sm_sm); INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_sparse_matrix, - assign); + assign); INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_null_matrix, null_assign); INSTALL_ASSIGNOP (op_asn_eq, octave_sparse_matrix, octave_null_str, null_assign);
--- a/src/OPERATORS/op-str-m.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-str-m.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003, 2004, 2005, 2007 John W. Eaton +Copyright (C) 2003, 2004, 2005, 2007, 2009 John W. Eaton This file is part of Octave. @@ -38,7 +38,7 @@ octave_value tmp = v2.convert_to_str_internal (false, false, - a1.is_sq_string () ? '\'' : '"'); + a1.is_sq_string () ? '\'' : '"'); if (! error_state) v1.assign (idx, tmp.char_matrix_value ());
--- a/src/OPERATORS/op-str-s.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-str-s.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 2003, 2004, 2005, 2007 John W. Eaton +Copyright (C) 2003, 2004, 2005, 2007, 2009 John W. Eaton This file is part of Octave. @@ -38,7 +38,7 @@ octave_value tmp = v2.convert_to_str_internal (false, false, - a1.is_sq_string () ? '\'' : '"'); + a1.is_sq_string () ? '\'' : '"'); if (! error_state) v1.assign (idx, tmp.char_matrix_value ());
--- a/src/OPERATORS/op-str-str.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-str-str.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,7 +1,7 @@ /* -Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2007, 2008 - John W. Eaton +Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004, 2005, 2007, + 2008, 2009John W. Eaton This file is part of Octave. @@ -46,12 +46,12 @@ } else return octave_value (v.char_matrix_value().transpose (), - a.is_sq_string () ? '\'' : '"'); + a.is_sq_string () ? '\'' : '"'); } // string by string ops. -#define DEFCHARNDBINOP_FN(name, op, t1, t2, e1, e2, f) \ +#define DEFCHARNDBINOP_FN(name, op, t1, t2, e1, e2, f) \ BINOPDECL (name, a1, a2) \ { \ dim_vector a1_dims = a1.dims (); \ @@ -64,17 +64,17 @@ \ if (a1_is_scalar) \ { \ - if (a2_is_scalar) \ - return octave_value ((v1.e1 ## _value ())(0) op (v2.e2 ## _value ())(0)); \ - else \ - return octave_value (f ((v1.e1 ## _value ())(0), v2.e2 ## _value ())); \ + if (a2_is_scalar) \ + return octave_value ((v1.e1 ## _value ())(0) op (v2.e2 ## _value ())(0)); \ + else \ + return octave_value (f ((v1.e1 ## _value ())(0), v2.e2 ## _value ())); \ } \ else \ { \ - if (a2_is_scalar) \ - return octave_value (f (v1.e1 ## _value (), (v2.e2 ## _value ())(0))); \ - else \ - return octave_value (f (v1.e1 ## _value (), v2.e2 ## _value ())); \ + if (a2_is_scalar) \ + return octave_value (f (v1.e1 ## _value (), (v2.e2 ## _value ())(0))); \ + else \ + return octave_value (f (v1.e1 ## _value (), v2.e2 ## _value ())); \ } \ }
--- a/src/OPERATORS/op-struct.cc Mon Dec 07 13:17:13 2009 -0500 +++ b/src/OPERATORS/op-struct.cc Mon Dec 07 14:49:48 2009 -0500 @@ -1,6 +1,6 @@ /* -Copyright (C) 1996, 1997, 2004, 2005, 2007, 2008 John W. Eaton +Copyright (C) 1996, 1997, 2004, 2005, 2007, 2008, 2009 John W. Eaton This file is part of Octave. @@ -51,7 +51,7 @@ static octave_value oct_catop_struct_matrix (octave_base_value& a1, const octave_base_value& a2, - const Array<octave_idx_type>&) + const Array<octave_idx_type>&) { octave_value retval; CAST_BINOP_ARGS (const octave_struct&, const octave_matrix&); @@ -66,7 +66,7 @@ static octave_value oct_catop_matrix_struct (octave_base_value& a1, const octave_base_value& a2, - const Array<octave_idx_type>&) + const Array<octave_idx_type>&) { octave_value retval; CAST_BINOP_ARGS (const octave_matrix&, const octave_struct&);